summaryrefslogtreecommitdiff
path: root/drivers/media/rc/ir-rc6-decoder.c
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2015-11-16 17:52:50 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-11-19 11:39:17 -0200
commitd80ca8bd71f0b01b2b12459189927cb3299cfab9 (patch)
tree693561395d207df695e99b546cef8fd84107cd21 /drivers/media/rc/ir-rc6-decoder.c
parentacc1c3c688ed8cc862ddc007eab0dcef839f4ec8 (diff)
[media] media: rc: move check whether a protocol is enabled to the core
Checking whether a protocol is enabled and calling the related decoder functions should be done by the rc core, not the protocol handlers. Properly handle lirc considering that no protocol bit is set for lirc. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/rc/ir-rc6-decoder.c')
-rw-r--r--drivers/media/rc/ir-rc6-decoder.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index d16bc67af732..e0e2edefa651 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -90,11 +90,6 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
u8 toggle;
enum rc_type protocol;
- if (!(dev->enabled_protocols &
- (RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 |
- RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE)))
- return 0;
-
if (!is_timing_event(ev)) {
if (ev.reset)
data->state = STATE_INACTIVE;