Skip to contentSkip to conversation

media: rc: Fix build failure with CONFIG_LIRC disabled

PATCH In review Sean Young 2 participants 2 messages Sep 23

Subsystems (2)
lore
Share & tools
lore

Sean Young

author maintainer
#0 lore raw

PATCH 1/1 media: rc: Fix build failure with CONFIG_LIRC disabled

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")
---
 drivers/media/rc/lirc_dev.c | 3 +++
 drivers/media/rc/rc-main.c  | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/media/rc/lirc_dev.c +3 -0
index d9b6ecca563f..f7b8f1f66d9b 100644
@@ -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));
 
drivers/media/rc/rc-main.c +1 -2
index 1c07bdd3b42b..a867bf9e8416 100644
@@ -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;
Signature · 1 line
2.55.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Sean Young

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")

Regards,

Hans

Quoted 33 lines
---
 drivers/media/rc/lirc_dev.c | 3 +++
 drivers/media/rc/rc-main.c  | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/media/rc/lirc_dev.c +3 -0
index d9b6ecca563f..f7b8f1f66d9b 100644
@@ -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));
 
drivers/media/rc/rc-main.c +1 -2
index 1c07bdd3b42b..a867bf9e8416 100644
@@ -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;