---

yaml --- r: 214274 b: refs/heads/master c: b9eca24 h: refs/heads/master v: v3
git-mirror · Aug 31, 2010 · a5789e6 · a5789e6
1 parent f43cbf9
commit a5789e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3613884d96b186f58a77af05122f84167604aad9
+refs/heads/master: b9eca24209a59ef0a8c3cbbbb94b8c76d4b3aae3
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -384,6 +384,12 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
 	unsigned int i;
 	u32 reg;
 
+	/*
+	 * If driver doesn't wake up firmware here,
+	 * rt2800_load_firmware will hang forever when interface is up again.
+	 */
+	rt2800_register_write(rt2x00dev, AUTOWAKEUP_CFG, 0x00000000);
+
 	/*
 	 * Wait for stable hardware.
 	 */

diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800pci.c b/trunk/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -196,8 +196,6 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
 {
 	u32 reg;
 
-	rt2800_register_write(rt2x00dev, AUTOWAKEUP_CFG, 0x00000000);
-
 	/*
 	 * enable Host program ram write selection
 	 */
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     	u32 reg;
-    	rt2800_register_write(rt2x00dev, AUTOWAKEUP_CFG, 0x00000000);
     	/*
     	 * enable Host program ram write selection
     	 */
@@ Expand Down @@