[media] ir-kbd-i2c: pass device code w/key in hauppauge case
authorJarod Wilson <jarod@redhat.com>
Fri, 4 Mar 2011 20:30:17 +0000 (17:30 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 22 Mar 2011 22:24:18 +0000 (19:24 -0300)
The new hauppauge key tables use both device code button code.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/ir-kbd-i2c.c

index 672935f..3ab875d 100644 (file)
@@ -108,7 +108,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                start, range, toggle, dev, code);
 
        /* return key */
-       *ir_key = code;
+       *ir_key = (dev << 8) | code;
        *ir_raw = ircode;
        return 1;
 }