---

yaml --- r: 194174 b: refs/heads/master c: f18d446 h: refs/heads/master v: v3
git-mirror · Apr 3, 2010 · 95ff5fd · 95ff5fd
1 parent 7876aac
commit 95ff5fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3efca0a63b4ac4d8849d37d082a95cf1a75162d
+refs/heads/master: f18d4463d092162f34a8bd226505627ceeac3e8a
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800pci.c b/trunk/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -60,6 +60,12 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
 	unsigned int i;
 	u32 reg;
 
+	/*
+	 * SOC devices don't support MCU requests.
+	 */
+	if (rt2x00_is_soc(rt2x00dev))
+		return;
+
 	for (i = 0; i < 200; i++) {
 		rt2800_register_read(rt2x00dev, H2M_MAILBOX_CID, &reg);