rfkill: don't impose global states on resume (just restore the previous states)

Once rfkill-input is disabled, the "global" states will only be used as
default initial states.

Since the states will always be the same after resume, we shouldn't
generate events on resume.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index fa430bd03f14..4e68ab439d5d 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -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;