From: Jarod Wilson <jarod@redhat.com>
Date: Fri, 4 Mar 2011 20:30:17 +0000 (-0300)
Subject: [media] ir-kbd-i2c: pass device code w/key in hauppauge case
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6e5b960176980852187b6f0bafa3db78130be42f;p=deliverable%2Flinux.git

[media] ir-kbd-i2c: pass device code w/key in hauppauge case

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>
---

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 672935f7aeba..3ab875d036e1 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -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;
 }