rfkill: don't impose global states on resume (just restore the previous states) (908209c1) · Commits · 戴 / test

include/linux/rfkill.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -212,7 +212,7 @@ void rfkill_destroy(struct rfkill *rfkill);
		*
		* rfkill drivers that get events when the hard-blocked state changes
		* use this function to notify the rfkill core (and through that also
		* userspace) of the current state -- they should also use this after
		* userspace) of the current state. They should also use this after
		* resume if the state could have changed.
		*
		* You need not (but may) call this function if poll_state is assigned.
		@@ -234,8 +234,9 @@ bool __must_check rfkill_set_hw_state(struct rfkill *rfkill, bool blocked);
		* rfkill drivers that get events when the soft-blocked state changes
		* (yes, some platforms directly act on input but allow changing again)
		* use this function to notify the rfkill core (and through that also
		* userspace) of the current state -- they should also use this after
		* resume if the state could have changed.
		* userspace) of the current state. It is not necessary to notify on
		* resume; since hibernation can always change the soft-blocked state,
		* the rfkill core will unconditionally restore the previous state.
		*
		* This function can be called in any context, even from within rfkill
		* callbacks.

+1 −5

Original line number	Diff line number	Diff line
		@@ -728,15 +728,11 @@ static int rfkill_resume(struct device *dev)
		struct rfkill *rfkill = to_rfkill(dev);
		bool cur;

		mutex_lock(&rfkill_global_mutex);
		cur = rfkill_global_states[rfkill->type].cur;
		cur = !!(rfkill->state & RFKILL_BLOCK_SW);
		rfkill_set_block(rfkill, cur);
		mutex_unlock(&rfkill_global_mutex);

		rfkill->suspended = false;

		schedule_work(&rfkill->uevent_work);

		rfkill_resume_polling(rfkill);

		return 0;