From 9cc20c3b75ac03334b0afd4f0a9647d9d6a7300b Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 6 Apr 2010 16:37:10 -0400
Subject: [PATCH] --- yaml --- r: 194181 b: refs/heads/master c:
 a124f3bed79d5fd5f87b09a7569ae6b7da4171d2 h: refs/heads/master i:   194179:
 d82ff0c564802e9af3343d46845e53421c56c4f7 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2800pci.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 453d29597fee..0fa25b28088e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91dd6c27a29f97d81d2f71651d3b6bb55a4c1788
+refs/heads/master: a124f3bed79d5fd5f87b09a7569ae6b7da4171d2
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800pci.c b/trunk/drivers/net/wireless/rt2x00/rt2800pci.c
index ce7e88ecbb00..1df2d44a6158 100644
--- 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);