]> git.hungrycats.org Git - linux/commitdiff
media: rc: Fix build failure with CONFIG_LIRC disabled
authorSean Young <sean@mess.org>
Wed, 23 Sep 2026 08:32:02 +0000 (09:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:14 +0000 (12:06 -0500)
commit 0c795849fd70d6bdb99aea5dd08d9b43128612f6 upstream.

commit 37efd09ba2c6 ("media: rc: Ensure registered is cleared in error
path") broke the build if CONFIG_LIRC was not enabled.

Fixes: 37efd09ba2c6 ("media: rc: Ensure registered is cleared in error path")
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202609230511.Em5Osw74-lkp@intel.com
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/rc/lirc_dev.c
drivers/media/rc/rc-main.c

index 7d4942925993a35844d733cef49fae5787ab8121..92f788683b5afe9cc1cf41163dfcfb33e5e8ec71 100644 (file)
@@ -775,6 +775,9 @@ void lirc_unregister(struct rc_dev *dev)
        unsigned long flags;
        struct lirc_fh *fh;
 
+       if (!device_is_registered(&dev->lirc_dev))
+               return;
+
        dev_dbg(&dev->dev, "lirc_dev: driver %s unregistered from minor = %d\n",
                dev->driver_name, MINOR(dev->lirc_dev.devt));
 
index cb1a087ed869d16f735ad78a6589ff7c3c3a3c92..2f1684a81eb14579f0452a5bfefdd1b028e26d2f 100644 (file)
@@ -1981,8 +1981,7 @@ out_lirc:
        scoped_guard(mutex, &dev->lock)
                dev->registered = false;
 
-       if (device_is_registered(&dev->lirc_dev))
-               lirc_unregister(dev);
+       lirc_unregister(dev);
        device_del(&dev->dev);
        /* registered already cleared above */
        goto out_free_table;