2 files changed, 7 insertions, 1 deletions

diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 4cd64b0d9825..f376a93927f7 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -108,6 +108,7 @@ struct rfkill {
 
         struct device dev;
         struct list_head node;
+        enum rfkill_state state_for_resume;
 };
 #define to_rfkill(d)    container_of(d, struct rfkill, dev)
 
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index ec26eae8004d..5ad411d3e8f8 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -565,10 +565,15 @@ static void rfkill_release(struct device *dev)
 #ifdef CONFIG_PM
 static int rfkill_suspend(struct device *dev, pm_message_t state)
 {
+        struct rfkill *rfkill = to_rfkill(dev);
+
         /* mark class device as suspended */
         if (dev->power.power_state.event != state.event)
                 dev->power.power_state = state;
 
+        /* store state for the resume handler */
+        rfkill->state_for_resume = rfkill->state;
+
         return 0;
 }
 
@@ -590,7 +595,7 @@ static int rfkill_resume(struct device *dev)
                 rfkill_toggle_radio(rfkill,
                                 rfkill_epo_lock_active ?
                                         RFKILL_STATE_SOFT_BLOCKED :
-                                        rfkill->state,
+                                        rfkill->state_for_resume,
                                 1);
 
                 mutex_unlock(&rfkill->mutex);