---

yaml --- r: 112051 b: refs/heads/master c: 417bd25 h: refs/heads/master i: 112049: de369d8 112047: ad0b732 v: v3
git-mirror · Oct 6, 2008 · 9363ce9 · 9363ce9
1 parent 5c2a3b6
commit 9363ce9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b5d13afeeee959a74114b73c560d3e243f34a11
+refs/heads/master: 417bd25ac4c6f76c8aafe8a584f3620f4a936b72
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
@@ -125,6 +125,7 @@ static void rfkill_led_trigger_activate(struct led_classdev *led)
 
 static void notify_rfkill_state_change(struct rfkill *rfkill)
 {
+	rfkill_led_trigger(rfkill, rfkill->state);
 	blocking_notifier_call_chain(&rfkill_notifier_list,
 			RFKILL_STATE_CHANGED,
 			rfkill);
@@ -217,10 +218,8 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,
 			rfkill->state = state;
 	}
 
-	if (force || rfkill->state != oldstate) {
-		rfkill_led_trigger(rfkill, rfkill->state);
+	if (force || rfkill->state != oldstate)
 		notify_rfkill_state_change(rfkill);
-	}
 
 	return retval;
 }