---

yaml --- r: 242180 b: refs/heads/master c: 6e5b960 h: refs/heads/master v: v3
git-mirror · Mar 22, 2011 · 9bcc4eb · 9bcc4eb
1 parent 4f95775
commit 9bcc4eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 206241069ecfa52c3b8873f8d7e31d434d2fcae1
+refs/heads/master: 6e5b960176980852187b6f0bafa3db78130be42f
diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/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;
 }