Commit 417bd25a authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by John W. Linville

rfkill: update LEDs for all state changes

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: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5b5d13af
...@@ -125,6 +125,7 @@ static void rfkill_led_trigger_activate(struct led_classdev *led) ...@@ -125,6 +125,7 @@ static void rfkill_led_trigger_activate(struct led_classdev *led)
static void notify_rfkill_state_change(struct rfkill *rfkill) static void notify_rfkill_state_change(struct rfkill *rfkill)
{ {
rfkill_led_trigger(rfkill, rfkill->state);
blocking_notifier_call_chain(&rfkill_notifier_list, blocking_notifier_call_chain(&rfkill_notifier_list,
RFKILL_STATE_CHANGED, RFKILL_STATE_CHANGED,
rfkill); rfkill);
...@@ -217,10 +218,8 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, ...@@ -217,10 +218,8 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,
rfkill->state = state; rfkill->state = state;
} }
if (force || rfkill->state != oldstate) { if (force || rfkill->state != oldstate)
rfkill_led_trigger(rfkill, rfkill->state);
notify_rfkill_state_change(rfkill); notify_rfkill_state_change(rfkill);
}
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment