summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/ir-rc5-sz-decoder.c
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2013-03-06 16:52:05 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-23 11:25:54 -0300
commit9719afae5e589b409e137c36f89073d134f0de33 (patch)
tree62d24aef194d46c95e607828902cd1c13bd2c0c8 /drivers/media/rc/ir-rc5-sz-decoder.c
parentefa914d7d05e69013054710e6aacaf225b8fc2a2 (diff)
downloadop-kernel-dev-9719afae5e589b409e137c36f89073d134f0de33.zip
op-kernel-dev-9719afae5e589b409e137c36f89073d134f0de33.tar.gz
[media] rc-core: don't treat dev->rc_map.rc_type as a bitmap
store_protocols() treats dev->rc_map.rc_type as a bitmap which is wrong for two reasons. First of all, it is pretty bogus to change the protocol type of the keymap just because the hardware has been asked to decode a different protocol. Second, dev->rc_map.rc_type is an enum (i.e. a single protocol) as pointed out by James Hogan <james.hogan@imgtec.com>. Fix both issues by introducing a separate enabled_protocols member to struct rc_dev. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc/ir-rc5-sz-decoder.c')
-rw-r--r--drivers/media/rc/ir-rc5-sz-decoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index fd807a8..865fe84 100644
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -48,7 +48,7 @@ static int ir_rc5_sz_decode(struct rc_dev *dev, struct ir_raw_event ev)
u8 toggle, command, system;
u32 scancode;
- if (!(dev->raw->enabled_protocols & RC_BIT_RC5_SZ))
+ if (!(dev->enabled_protocols & RC_BIT_RC5_SZ))
return 0;
if (!is_timing_event(ev)) {
OpenPOWER on IntegriCloud