2 files changed, 48 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 097081eb505f..13bc5d160761 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -394,7 +394,7 @@ void cx88_ir_irq(struct cx88_core *core)
 {
         struct cx88_IR *ir = core->ir;
         u32 samples, ircode;
-        int i;
+        int i, start, range, toggle, dev, code;
 
         if (NULL == ir)
                 return;
@@ -463,11 +463,37 @@ void cx88_ir_irq(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
-        case CX88_BOARD_PINNACLE_PCTV_HD_800i:
         case CX88_BOARD_HAUPPAUGE_HVR4000:
         case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
                 ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
                 ir_dprintk("biphase decoded: %x\n", ircode);
+                /*
+                 * RC5 has an extension bit which adds a new range
+                 * of available codes, this is detected here. Also
+                 * hauppauge remotes (black/silver) always use
+                 * specific device ids. If we do not filter the
+                 * device ids then messages destined for devices
+                 * such as TVs (id=0) will get through to the
+                 * device causing mis-fired events.
+                 */
+                /* split rc5 data block ... */
+                start = (ircode & 0x2000) >> 13;
+                range = (ircode & 0x1000) >> 12;
+                toggle= (ircode & 0x0800) >> 11;
+                dev   = (ircode & 0x07c0) >> 6;
+                code  = (ircode & 0x003f) | ((range << 6) ^ 0x0040);
+                if( start != 1)
+                        /* no key pressed */
+                        break;
+                if ( dev != 0x1e && dev != 0x1f )
+                        /* not a hauppauge remote */
+                        break;
+                ir_input_keydown(ir->input, &ir->ir, code, ircode);
+                ir->release = jiffies + msecs_to_jiffies(120);
+                break;
+        case CX88_BOARD_PINNACLE_PCTV_HD_800i:
+                ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
+                ir_dprintk("biphase decoded: %x\n", ircode);
                 if ((ircode & 0xfffff000) != 0x3000)
                         break;
                 ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f, ircode);
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index a30254bed311..703195a5ad4e 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -65,7 +65,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                                int size, int offset)
 {
         unsigned char buf[6];
-        int start, range, toggle, dev, code;
+        int start, range, toggle, dev, code, ircode;
 
         /* poll IR chip */
         if (size != i2c_master_recv(&ir->c,buf,size))
@@ -85,6 +85,24 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
         if (!start)
                 /* no key pressed */
                 return 0;
+        /*
+         * Hauppauge remotes (black/silver) always use
+         * specific device ids. If we do not filter the
+         * device ids then messages destined for devices
+         * such as TVs (id=0) will get through causing
+         * mis-fired events.
+         *
+         * We also filter out invalid key presses which
+         * produce annoying debug log entries.
+         */
+        ircode= (start << 12) | (toggle << 11) | (dev << 6) | code;
+        if ((ircode & 0x1fff)==0x1fff)
+                /* invalid key press */
+                return 0;
+
+        if (dev!=0x1e && dev!=0x1f)
+                /* not a hauppauge remote */
+                return 0;
 
         if (!range)
                 code += 64;
@@ -94,7 +112,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
 
         /* return key */
         *ir_key = code;
-        *ir_raw = (start << 12) | (toggle << 11) | (dev << 6) | code;
+        *ir_raw = ircode;
         return 1;
 }