From 7ece67755e8f4d681c6e2b574d04f9926602586d Mon Sep 17 00:00:00 2001
From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Date: Thu, 9 Oct 2008 18:15:32 -0300
Subject: [PATCH] --- yaml --- r: 121576 b: refs/heads/master c:
 176707997bc3da2c4e32715c35cfebba0334ed68 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/rfkill/rfkill.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 68d88d6e36fd..277d126529ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d003922dab6a66027344a787e9846ecf35a706a8
+refs/heads/master: 176707997bc3da2c4e32715c35cfebba0334ed68
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
index e348eab756f3..c9180c8771c6 100644
--- a/trunk/net/rfkill/rfkill.c
+++ b/trunk/net/rfkill/rfkill.c
@@ -581,8 +581,17 @@ static int rfkill_resume(struct device *dev)
 
 		dev->power.power_state.event = PM_EVENT_ON;
 
-		/* restore radio state AND notify everybody */
-		rfkill_toggle_radio(rfkill, rfkill->state, 1);
+		/*
+		 * If we are under EPO, kick transmitter offline,
+		 * otherwise restore to pre-suspend state.
+		 *
+		 * Issue a notification in any case
+		 */
+		rfkill_toggle_radio(rfkill,
+				rfkill_epo_lock_active ?
+					RFKILL_STATE_SOFT_BLOCKED :
+					rfkill->state,
+				1);
 
 		mutex_unlock(&rfkill->mutex);
 	}