Merge branch 'sched/urgent' into sched/clock

[linux-2.6-omap-h63xx.git] / drivers / media / video / bt8xx / bttv-input.c

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index e7c521b8444afea5dca779091a9fa4bda2b8c691..a38af98f4cae9e33ad4f47cd1873407a47c34dab 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -69,6 +69,11 @@ static void ir_handle_key(struct bttv *btv)
            (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
                ir_input_keydown(ir->dev,&ir->ir,data,data);
        } else {
+               /* HACK: Probably, ir->mask_keydown is missing
+                  for this board */
+               if (btv->c.type == BTTV_BOARD_WINFAST2000)
+                       ir_input_keydown(ir->dev, &ir->ir, data, data);
+
                ir_input_nokey(ir->dev,&ir->ir);
        }
 
@@ -273,6 +278,12 @@ int bttv_input_init(struct bttv *btv)
                ir->mask_keyup   = 0x004000;
                ir->polling      = 50; /* ms */
                break;
+       case BTTV_BOARD_KOZUMI_KTV_01C:
+               ir_codes         = ir_codes_pctv_sedna;
+               ir->mask_keycode = 0x001f00;
+               ir->mask_keyup   = 0x006000;
+               ir->polling      = 50; /* ms */
+               break;
        }
        if (NULL == ir_codes) {
                dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);