From: Henrique de Moraes Holschuh Date: Sat, 11 Oct 2008 16:55:13 +0000 (+0000) Subject: rfkill: update LEDs for all state changes X-Git-Tag: v2.6.27.2~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95a3690291668508570c593ccc8b69af1f0e3f3f;p=thirdparty%2Fkernel%2Fstable.git 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 Acked-by: Ivo van Doorn Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 74aecc098bad1..10b05ceee8ae6 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; }