diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-10-11 16:55:13 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-18 10:49:12 -0700 |
| commit | 95a3690291668508570c593ccc8b69af1f0e3f3f (patch) | |
| tree | f13666d51f448c6c56ac8ad58339847c417fdd1e /net | |
| parent | 92fa67e9260a65f69d868c4fcc92c9cee428c6f9 (diff) | |
rfkill: update LEDs for all state changes
commit 417bd25ac4c6f76c8aafe8a584f3620f4a936b72 upstream
The LED state was not being updated by rfkill_force_state(), which
will cause regressions in wireless drivers that had old-style rfkill
support and are updated to use rfkill_force_state().
The LED state was not being updated when a change was detected through
the rfkill->get_state() hook, either.
Move the LED trigger update calls into notify_rfkill_state_change(),
where it should have been in the first place. This takes care of both
issues above.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rfkill/rfkill.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 74aecc098ba..10b05ceee8a 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c @@ -117,6 +117,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); @@ -204,10 +205,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; } |