summaryrefslogtreecommitdiff
path: root/drivers/media/rc/rc-main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/rc/rc-main.c')
-rw-r--r--drivers/media/rc/rc-main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 058807bc80dc..5830cb2c5943 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1814,7 +1814,7 @@ int rc_register_device(struct rc_dev *dev)
}
/* Ensure that the lirc kfifo is setup before we start the thread */
- if (dev->driver_type != RC_DRIVER_SCANCODE) {
+ if (dev->allowed_protocols != RC_PROTO_BIT_CEC) {
rc = ir_lirc_register(dev);
if (rc < 0)
goto out_rx;
@@ -1835,7 +1835,7 @@ int rc_register_device(struct rc_dev *dev)
return 0;
out_lirc:
- if (dev->driver_type != RC_DRIVER_SCANCODE)
+ if (dev->allowed_protocols != RC_PROTO_BIT_CEC)
ir_lirc_unregister(dev);
out_rx:
rc_free_rx_device(dev);
@@ -1898,7 +1898,7 @@ void rc_unregister_device(struct rc_dev *dev)
* lirc device should be freed with dev->registered = false, so
* that userspace polling will get notified.
*/
- if (dev->driver_type != RC_DRIVER_SCANCODE)
+ if (dev->allowed_protocols != RC_PROTO_BIT_CEC)
ir_lirc_unregister(dev);
device_del(&dev->dev);