diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-30 10:54:12 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-30 12:09:28 +0100 |
| commit | cef83483341e258beed49ce78fb2cc0c46ab1757 (patch) | |
| tree | bf40db4c135cff1b0e98f395a6d6c1f969d4941d /drivers/media | |
| parent | [media] rc-core: fix protocol_change regression in ir_raw_event_register (diff) | |
| download | linux-cef83483341e258beed49ce78fb2cc0c46ab1757.tar.xz linux-cef83483341e258beed49ce78fb2cc0c46ab1757.zip | |
[media] rc5-decoder: BZ#85721: Fix RC5-SZ decoding
Changeset e87b540be2dd broke RC5-SZ decoding, as it forgot to add
the extra bit check for the enabled protocols at the beginning of
the logic.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/rc/ir-rc5-decoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c index 2ef763928ca4..84fa6e9b59a1 100644 --- a/drivers/media/rc/ir-rc5-decoder.c +++ b/drivers/media/rc/ir-rc5-decoder.c @@ -53,7 +53,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev) u32 scancode; enum rc_type protocol; - if (!(dev->enabled_protocols & (RC_BIT_RC5 | RC_BIT_RC5X))) + if (!(dev->enabled_protocols & (RC_BIT_RC5 | RC_BIT_RC5X | RC_BIT_RC5_SZ))) return 0; if (!is_timing_event(ev)) { |