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

Commit 17670799 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by John W. Linville
Browse files

rfkill: honour EPO state when resuming a rfkill controller 



rfkill_resume() would always restore the rfkill controller state to its
pre-suspend state.

Now that we know when we are under EPO, kick the rfkill controller to
SOFT_BLOCKED state instead of to its pre-suspend state when it is resumed
while EPO mode is active.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d003922d

net/rfkill/rfkill.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -581,8 +581,17 @@ static int rfkill_resume(struct device *dev) 




		dev->power.power_state.event = PM_EVENT_ON;

		dev->power.power_state.event = PM_EVENT_ON;





		/* restore radio state AND notify everybody */

		/*

		rfkill_toggle_radio(rfkill, rfkill->state, 1);

		 * If we are under EPO, kick transmitter offline,

		 * otherwise restore to pre-suspend state.

		 *

		 * Issue a notification in any case

		 */

		rfkill_toggle_radio(rfkill,

				rfkill_epo_lock_active ?

					RFKILL_STATE_SOFT_BLOCKED :

					rfkill->state,

				1);





		mutex_unlock(&rfkill->mutex);

		mutex_unlock(&rfkill->mutex);

	}

	}