浏览代码

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: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Henrique de Moraes Holschuh 16 年之前
父节点
当前提交
417bd25ac4
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      net/rfkill/rfkill.c

+ 2 - 3
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)
 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,
 			rfkill->state = state;
 			rfkill->state = state;
 	}
 	}
 
 
-	if (force || rfkill->state != oldstate) {
-		rfkill_led_trigger(rfkill, rfkill->state);
+	if (force || rfkill->state != oldstate)
 		notify_rfkill_state_change(rfkill);
 		notify_rfkill_state_change(rfkill);
-	}
 
 
 	return retval;
 	return retval;
 }
 }