Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96185664 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by John W. Linville
Browse files

RFKILL: set the status of the leds on activation. 



Provide default activate function to set the state of the led
when the led becomes bound to the trigger

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7c4f4578

net/rfkill/rfkill.c

+12 −0
Original line number Diff line number Diff line
@@ -105,6 +105,16 @@ static void rfkill_led_trigger(struct rfkill *rfkill, 
#endif /* CONFIG_RFKILL_LEDS */

}



#ifdef CONFIG_RFKILL_LEDS

static void rfkill_led_trigger_activate(struct led_classdev *led)

{

	struct rfkill *rfkill = container_of(led->trigger,

			struct rfkill, led_trigger);



	rfkill_led_trigger(rfkill, rfkill->state);

}

#endif /* CONFIG_RFKILL_LEDS */



static void notify_rfkill_state_change(struct rfkill *rfkill)

{

	blocking_notifier_call_chain(&rfkill_notifier_list,
@@ -591,6 +601,8 @@ static void rfkill_led_trigger_register(struct rfkill *rfkill) 


	if (!rfkill->led_trigger.name)

		rfkill->led_trigger.name = rfkill->dev.bus_id;

	if (!rfkill->led_trigger.activate)

		rfkill->led_trigger.activate = rfkill_led_trigger_activate;

	error = led_trigger_register(&rfkill->led_trigger);

	if (error)

		rfkill->led_trigger.name = NULL;