summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7134
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2014-04-04 01:32:01 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-24 02:52:26 +0200
commit0bc56cbef9fb496c79e34c46329f016064d3b0f6 (patch)
tree193541a785efeb5bae01f3d38f0364689736ad3b /drivers/media/pci/saa7134
parent[media] rc-core: document the protocol type (diff)
downloadlinux-0bc56cbef9fb496c79e34c46329f016064d3b0f6.tar.xz
linux-0bc56cbef9fb496c79e34c46329f016064d3b0f6.zip
[media] saa7134: NEC scancode fix
This driver codes the two address bytes in reverse order when compared to the other drivers, so make it consistent (and update the keymap, note that the result is a prefix change from 0x6b86 -> 0x866b, and the latter is pretty common among the NECX keymaps. While not conclusive, it's still a strong hint that the change is correct). Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134')
-rw-r--r--drivers/media/pci/saa7134/saa7134-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
index 43dd8bda02e1..887429ba299b 100644
--- a/drivers/media/pci/saa7134/saa7134-input.c
+++ b/drivers/media/pci/saa7134/saa7134-input.c
@@ -346,7 +346,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_type *protocol,
return 0;
*protocol = RC_TYPE_NEC;
- *scancode = RC_SCANCODE_NECX(((data[10] << 8) | data[11]), data[9]);
+ *scancode = RC_SCANCODE_NECX(data[11] << 8 | data[10], data[9]);
*toggle = 0;
return 1;
}