[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>

diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c
index e3a1fb6d6690dd5049303d0967f779f91d87e87f..5870da6a567f3e9b4bd24c685625b0be3439b737 100644 (file)
--- a/drivers/media/cec/cec-core.c
+++ b/drivers/media/cec/cec-core.c
@@ -277,7 +277,6 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
        adap->rc->input_id.version = 1;
        adap->rc->driver_name = CEC_NAME;
        adap->rc->allowed_protocols = RC_PROTO_BIT_CEC;
-       adap->rc->enabled_protocols = RC_PROTO_BIT_CEC;
        adap->rc->priv = adap;
        adap->rc->map_name = RC_MAP_CEC;
        adap->rc->timeout = MS_TO_NS(100);

diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
index a374e2a0ac3d84b7ba2b50f1583c3fa481c2b357..8b5f7d0435e43a57ac62d53af2ea6a07bdbadfef 100644 (file)
--- a/drivers/media/i2c/ir-kbd-i2c.c
+++ b/drivers/media/i2c/ir-kbd-i2c.c
@@ -460,7 +460,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         */
        rc->map_name       = ir->ir_codes;
        rc->allowed_protocols = rc_proto;
-       rc->enabled_protocols = rc_proto;
        if (!rc->driver_name)
                rc->driver_name = MODULE_NAME;
 

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 33bddba6e5413f463ac9b425448d1c1e327bdab1..127f3215cd848bb33a4c4c3513874b83c3adeb8d 100644 (file)
--- 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)