rfkill: rfkill_set_block() when suspended nitpick
PATCH 1/4 rfkill: rfkill_set_block() when suspended nitpick
If we return after fiddling with the state, userspace will see the wrong state and rfkill_set_sw_state() won't work until the next call to rfkill_set_block(). At the moment rfkill_set_block() will always be called from rfkill_resume(), but this will change in future.
Also, presumably the point of this test is to avoid bothering devices which may be suspended. If we don't want to call set_block(), we probably don't want to call query() either :-).
Signed-off-by Alan Jenkins <[email protected]>
--- net/rfkill/core.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
net/rfkill/core.c +3 -3
@@ -270,6 +270,9 @@ static void rfkill_set_block(struct rfkill *rfkill, bool blocked)unsigned long flags;int err; +if (unlikely (rfkill->dev.power.power_state.event &PM_EVENT_SLEEP )) +return ; +/* * Some platforms (...!) generate input events which affect the * _hard_ kill state -- whenever something tries to change the
@@ -292,9 +295,6 @@ static void rfkill_set_block(struct rfkill *rfkill, bool blocked) rfkill->state |=RFKILL_BLOCK_SW_SETCALL ;spin_unlock_irqrestore (&rfkill->lock, flags); -if (unlikely (rfkill->dev.power.power_state.event &PM_EVENT_SLEEP )) -return ; - err = rfkill->ops->set_block (rfkill->data, blocked);spin_lock_irqsave (&rfkill->lock, flags);