summaryrefslogtreecommitdiff
path: root/drivers/media/rc/ir-sony-decoder.c
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2015-11-16 19:52:50 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-11-19 13:39:17 (GMT)
commitd80ca8bd71f0b01b2b12459189927cb3299cfab9 (patch)
tree693561395d207df695e99b546cef8fd84107cd21 /drivers/media/rc/ir-sony-decoder.c
parentacc1c3c688ed8cc862ddc007eab0dcef839f4ec8 (diff)
downloadlinux-d80ca8bd71f0b01b2b12459189927cb3299cfab9.tar.xz
[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-sony-decoder.c')
-rw-r--r--drivers/media/rc/ir-sony-decoder.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
index 58ef06f..baa972c 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -46,10 +46,6 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
u32 scancode;
u8 device, subdevice, function;
- if (!(dev->enabled_protocols &
- (RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20)))
- return 0;
-
if (!is_timing_event(ev)) {
if (ev.reset)
data->state = STATE_INACTIVE;