---

yaml --- r: 300944 b: refs/heads/master c: b7e1d22 h: refs/heads/master v: v3
git-mirror · Apr 13, 2012 · 489f49e · 489f49e
1 parent 1ad7bba
commit 489f49e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7b395e9f898313c2add740af04361e59b06e68b
+refs/heads/master: b7e1d225f5c2d397136fd79472d32b0f87017612
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -426,6 +426,8 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
 		rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000002);
 	}
 
+	rt2800_disable_wpdma(rt2x00dev);
+
 	/*
 	 * Write firmware to the device.
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -426,6 +426,8 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev, @@
     		rt2800_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000002);
     	}
+    	rt2800_disable_wpdma(rt2x00dev);
     	/*
     	 * Write firmware to the device.
     	 */
@@ Expand Down @@