---

yaml --- r: 73530 b: refs/heads/master c: 8a8f1c0 h: refs/heads/master v: v3
git-mirror · Nov 11, 2007 · a425ed6 · a425ed6
1 parent bea77a7
commit a425ed6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d8c90e3fd1f8895f6d48bdcb34ba69a1fe73616
+refs/heads/master: 8a8f1c0437a77cce29c1cb6089f01f22a6d9ca6e
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
@@ -388,19 +388,20 @@ int rfkill_register(struct rfkill *rfkill)
 	if (!rfkill->toggle_radio)
 		return -EINVAL;
 
+	snprintf(dev->bus_id, sizeof(dev->bus_id),
+		 "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
+
+	rfkill_led_trigger_register(rfkill);
+
 	error = rfkill_add_switch(rfkill);
 	if (error)
 		return error;
 
-	snprintf(dev->bus_id, sizeof(dev->bus_id),
-		 "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
-
 	error = device_add(dev);
 	if (error) {
 		rfkill_remove_switch(rfkill);
 		return error;
 	}
-	rfkill_led_trigger_register(rfkill);
 
 	return 0;
 }
@@ -416,9 +417,9 @@ EXPORT_SYMBOL(rfkill_register);
  */
 void rfkill_unregister(struct rfkill *rfkill)
 {
-	rfkill_led_trigger_unregister(rfkill);
 	device_del(&rfkill->dev);
 	rfkill_remove_switch(rfkill);
+	rfkill_led_trigger_unregister(rfkill);
 	put_device(&rfkill->dev);
 }
 EXPORT_SYMBOL(rfkill_unregister);