rfkill - rfkill_register() doesn't call rfkill_led_trigger_unregister() on error

PATCH New Eric Paris 1 participant 1 message Jan 13, 2008 Rfkill

Share & tools

Eric Paris

author

2008-01-13 21:21 UTC #0 lore raw

PATCH 1/1 rfkill - rfkill_register() doesn't call rfkill_led_trigger_unregister() on error

Code inspection turned up that error cases in rfkill_register() do not call rfkill_led_trigger_unregister() even though we have already registered.

Signed-off-by Eric Paris <[email protected]>

---

 net/rfkill/rfkill.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

fs/ext3/inode.c +0 -0

net/rfkill/rfkill.c +4 -1

index 4469a7b..d06d338 100644
@@ -392,11 +392,14 @@ int rfkill_register(struct rfkill *rfkill)
 	rfkill_led_trigger_register(rfkill);
 
 	error = rfkill_add_switch(rfkill);
-	if (error)
+	if (error) {
+		rfkill_led_trigger_unregister(rfkill);
 		return error;
+	}
 
 	error = device_add(dev);
 	if (error) {
+		rfkill_led_trigger_unregister(rfkill);
 		rfkill_remove_switch(rfkill);
 		return error;
 	}