diff options
author | Jarod Wilson <jarod@redhat.com> | 2011-03-04 15:30:17 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 18:24:18 -0400 |
commit | 6e5b960176980852187b6f0bafa3db78130be42f (patch) | |
tree | 3eef32486a5a67ed7603e9e4e3c7551695da6dbe /drivers/media | |
parent | 206241069ecfa52c3b8873f8d7e31d434d2fcae1 (diff) |
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
108 | start, range, toggle, dev, code); | 108 | start, range, toggle, dev, code); |
109 | 109 | ||
110 | /* return key */ | 110 | /* return key */ |
111 | *ir_key = code; | 111 | *ir_key = (dev << 8) | code; |
112 | *ir_raw = ircode; | 112 | *ir_raw = ircode; |
113 | return 1; | 113 | return 1; |
114 | } | 114 | } |