From 9dbfaa2a5a7f26a03db14ecd2c7240abedf0e46b Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Sat, 6 Oct 2007 14:12:42 +0200
Subject: [PATCH] --- yaml --- r: 66971 b: refs/heads/master c:
 6d7f9877a66a3abe0b04b63d1de4659919e21a92 h: refs/heads/master i:   66969:
 eca3da381f6917e4f302dbd025de2e85a591d9be   66967:
 c7c0c1363a7588fd91bb1e1dd5ced81626adfa71 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00.h    | 1 +
 trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3d3f4ed87acb..4d827820f1ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a84732a5c9758a4bd59088787cac23508ef8b62
+refs/heads/master: 6d7f9877a66a3abe0b04b63d1de4659919e21a92
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00.h b/trunk/drivers/net/wireless/rt2x00/rt2x00.h
index 5d30ca6680b6..d280d0ec9042 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00.h
@@ -508,6 +508,7 @@ struct rt2x00_dev {
 #define CONFIG_EXTERNAL_LNA_BG		13
 #define CONFIG_DOUBLE_ANTENNA		14
 #define CONFIG_DISABLE_LINK_TUNING	15
+#define DEVICE_STARTED_SUSPEND		16
 
 	/*
 	 * Chipset identification.
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
index b6a5c3481126..f25475318c9b 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1088,12 +1088,13 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
 	 */
 	if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
 		goto exit;
+	__set_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags);
 
 	/*
 	 * Disable radio and unitialize all items
 	 * that must be recreated on resume.
 	 */
-	rt2x00lib_disable_radio(rt2x00dev);
+	rt2x00mac_stop(rt2x00dev->hw);
 	rt2x00lib_uninitialize(rt2x00dev);
 	rt2x00debug_deregister(rt2x00dev);
 
@@ -1123,9 +1124,9 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
 	rt2x00debug_register(rt2x00dev);
 
 	/*
-	 * Only continue if mac80211 has open interfaces.
+	 * Only continue if mac80211 had open interfaces.
 	 */
-	if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
+	if (!__test_and_clear_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags))
 		return 0;
 
 	/*