summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorUlrich Eckhardt <uli-lirc@uli-eckhardt.de>2014-10-10 13:27:32 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-03 10:56:51 -0200
commitd358aefdc0cc92b16ced449f998dbad639db6809 (patch)
treef17b35f0aaa93c3d8f07a56c280fe3dbfbc131de /drivers/media
parent4cdd32b4ba101ae07331f2058b20d7ce0ecc4961 (diff)
downloadlinux-d358aefdc0cc92b16ced449f998dbad639db6809.tar.bz2
[media] imon: fix other RC type protocol support
With kernel 3.17 the imon remote control for device 15c2:0034 does not work anymore, which uses the OTHER protocol. Only the front panel buttons which uses the RC6 protocol are working. Adds the missing comparison for the RC_BIT_OTHER. Cc: stable@vger.kernel.org # for Kernel 3.17 Signed-off-by: Ulrich Eckhardt <uli@uli-eckhardt.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/rc/imon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index b8837dd39bb2..65f80b8b9f7a 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -1678,7 +1678,8 @@ static void imon_incoming_packet(struct imon_context *ictx,
if (press_type == 0)
rc_keyup(ictx->rdev);
else {
- if (ictx->rc_type == RC_BIT_RC6_MCE)
+ if (ictx->rc_type == RC_BIT_RC6_MCE ||
+ ictx->rc_type == RC_BIT_OTHER)
rc_keydown(ictx->rdev,
ictx->rc_type == RC_BIT_RC6_MCE ? RC_TYPE_RC6_MCE : RC_TYPE_OTHER,
ictx->rc_scancode, ictx->rc_toggle);