commit 632041f306707df94110441f55b1458ebeb096db
author Eric Paris <eparis@redhat.com> Sun Jan 13 16:20:56 2008 -0500
committer David S. Miller <davem@davemloft.net> Sun Jan 20 20:31:36 2008 -0800
tree effe40dae5c459f6ee20ce55d2f2f7810aceb132
parent a7da60f41551abb3c520b03d42ec05dd7decfc7f

rfkill: 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 <eparis@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/rfkill/rfkill.c

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 4469a7b..d06d338 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -392,11 +392,14 @@
 	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;
 	}