---

yaml
---
r: 122331
b: refs/heads/master
c: 24689c8
h: refs/heads/master
i:
  122329: ec9ac3e
  122327: 38f762d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f80b5e99c7dac5a9a0d72496cec5075a12cd1476
+refs/heads/master: 24689c8590be6bc0486af665c5ceda6aeff4d53a

trunk/net/rfkill/rfkill.c

@@ -580,12 +580,22 @@ static int rfkill_suspend(struct device *dev, pm_message_t state)
 static int rfkill_resume(struct device *dev)
 {
 	struct rfkill *rfkill = to_rfkill(dev);
+	enum rfkill_state newstate;
 
 	if (dev->power.power_state.event != PM_EVENT_ON) {
 		mutex_lock(&rfkill->mutex);
 
 		dev->power.power_state.event = PM_EVENT_ON;
 
+		/*
+		 * rfkill->state could have been modified before we got
+		 * called, and won't be updated by rfkill_toggle_radio()
+		 * in force mode.  Sync it FIRST.
+		 */
+		if (rfkill->get_state &&
+		    !rfkill->get_state(rfkill->data, &newstate))
+			rfkill->state = newstate;
+
 		/*
 		 * If we are under EPO, kick transmitter offline,
 		 * otherwise restore to pre-suspend state.