---

yaml --- r: 107085 b: refs/heads/master c: 37f55e9 h: refs/heads/master i: 107083: 2e85c53 v: v3
git-mirror · Jul 29, 2008 · 05858b6 · 05858b6
1 parent 31f0ffb
commit 05858b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd9b2212e25e6411b6f309707f4e2683d164250
+refs/heads/master: 37f55e9d78d1b63047b1b7ae175cdce650547ba8
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
@@ -590,8 +590,10 @@ static void rfkill_led_trigger_register(struct rfkill *rfkill)
 static void rfkill_led_trigger_unregister(struct rfkill *rfkill)
 {
 #ifdef CONFIG_RFKILL_LEDS
-	if (rfkill->led_trigger.name)
+	if (rfkill->led_trigger.name) {
 		led_trigger_unregister(&rfkill->led_trigger);
+		rfkill->led_trigger.name = NULL;
+	}
 #endif
 }
 
@@ -627,8 +629,8 @@ int rfkill_register(struct rfkill *rfkill)
 
 	error = device_add(dev);
 	if (error) {
-		rfkill_led_trigger_unregister(rfkill);
 		rfkill_remove_switch(rfkill);
+		rfkill_led_trigger_unregister(rfkill);
 		return error;
 	}