aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-09-01 09:55:59 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2017-10-04 15:22:26 -0300
commit831c4c81e8ceba7d34b7fc66da1693bc4b9e7e11 (patch)
tree2dedee55bb3a346a03db2fbbcd430a626fef045b /drivers/media/rc
parentefdc16adb7d37a57b4d07833bbab73a0a1aed476 (diff)
[media] media: rc: ensure that protocols are enabled for scancode drivers
rc scancode drivers without change_protocol should have all protocols enabled at all time. This was only true for cec and ir-kbd-i2c. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/rc-main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 33bddba6e541..127f3215cd84 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1638,6 +1638,9 @@ static int rc_prepare_rx_device(struct rc_dev *dev)
rc_proto = BIT_ULL(rc_map->rc_proto);
+ if (dev->driver_type == RC_DRIVER_SCANCODE && !dev->change_protocol)
+ dev->enabled_protocols = dev->allowed_protocols;
+
if (dev->change_protocol) {
rc = dev->change_protocol(dev, &rc_proto);
if (rc < 0)

Privacy Policy