rc: raw decoder for keymap protocol is not loaded on register

BugLink: http://bugs.launchpad.net/bugs/1674288
commit 413808685dd7c9b54bbc5af79da2eaddd0fc3cb2 upstream.

When the protocol is set via the sysfs protocols attribute, the
decoder is loaded. However, when it is not when a device is first
plugged in or registered.

Fixes: acc1c3c ("[media] media: rc: load decoder modules on-demand")
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index dedaf38c5ff6cceee42e29f5871794f1bad23b1d..9a397da137b18e5cd68f250057a328afaf7fb2f8 100644 (file)
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1441,6 +1441,7 @@ int rc_register_device(struct rc_dev *dev)
        int attr = 0;
        int minor;
        int rc;
+       u64 rc_type;
 
        if (!dev || !dev->map_name)
                return -EINVAL;
@@ -1526,14 +1527,18 @@ int rc_register_device(struct rc_dev *dev)
                        goto out_input;
        }
 
+       rc_type = BIT_ULL(rc_map->rc_type);
+
        if (dev->change_protocol) {
-               u64 rc_type = (1ll << rc_map->rc_type);
                rc = dev->change_protocol(dev, &rc_type);
                if (rc < 0)
                        goto out_raw;
                dev->enabled_protocols = rc_type;
        }
 
+       if (dev->driver_type == RC_DRIVER_IR_RAW)
+               ir_raw_load_modules(&rc_type);
+
        /* Allow the RC sysfs nodes to be accessible */
        atomic_set(&dev->initialized, 1);