summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/ir-sharp-decoder.c
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2015-11-16 20:52:50 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-11-19 14:39:17 +0100
commitd80ca8bd71f0b01b2b12459189927cb3299cfab9 (patch)
tree693561395d207df695e99b546cef8fd84107cd21 /drivers/media/rc/ir-sharp-decoder.c
parent[media] media: rc: load decoder modules on-demand (diff)
downloadlinux-d80ca8bd71f0b01b2b12459189927cb3299cfab9.tar.xz
linux-d80ca8bd71f0b01b2b12459189927cb3299cfab9.zip
[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-sharp-decoder.c')
-rw-r--r--drivers/media/rc/ir-sharp-decoder.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c
index 1f331644d07c..317677f06f2c 100644
--- a/drivers/media/rc/ir-sharp-decoder.c
+++ b/drivers/media/rc/ir-sharp-decoder.c
@@ -48,9 +48,6 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
struct sharp_dec *data = &dev->raw->sharp;
u32 msg, echo, address, command, scancode;
- if (!(dev->enabled_protocols & RC_BIT_SHARP))
- return 0;
-
if (!is_timing_event(ev)) {
if (ev.reset)
data->state = STATE_INACTIVE;