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

[safe/jmp/linux-2.6] / net / rfkill / core.c

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index fa430bd..4e68ab4 100644 (file)
--- 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;