mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
media: rc: Fix build failure with CONFIG_LIRC disabled
commit37efd09ba2("media: rc: Ensure registered is cleared in error path") broke the build if CONFIG_LIRC was not enabled. Fixes:37efd09ba2("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>
This commit is contained in:
parent
05d9c515cf
commit
0c795849fd
|
|
@ -777,6 +777,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));
|
||||
|
||||
|
|
|
|||
|
|
@ -2018,8 +2018,7 @@ int rc_register_device(struct rc_dev *dev)
|
|||
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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user