From 837451c11d235db342574cc6026341e72dbdf1ad Mon Sep 17 00:00:00 2001
From: Alban Browaeys <prahal@yahoo.com>
Date: Fri, 4 Dec 2009 23:46:57 +0100
Subject: [PATCH] --- yaml --- r: 183279 b: refs/heads/master c:
 c70762f9acad654002704f1e53436a0ba3356c31 h: refs/heads/master i:   183277:
 541318af68f279ae69466161a15362a0610a512b   183275:
 4ed92938be7a9b767d4ce15f5bb96ccec22a8147   183271:
 5a43b6661652b9715672bc9387f85307f59f3b38   183263:
 d3a0551c5f703101269b852a1efa61866f5a0dc9 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0f1405f85cc..bb733929614b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 050e8a47dc8b056c880f380ffd01055669f8fe68
+refs/heads/master: c70762f9acad654002704f1e53436a0ba3356c31
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00pci.c b/trunk/drivers/net/wireless/rt2x00/rt2x00pci.c
index 0feb4d0e4668..801be436cf1d 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -41,6 +41,9 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev,
 {
 	unsigned int i;
 
+	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
+		return 0;
+
 	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
 		rt2x00pci_register_read(rt2x00dev, offset, reg);
 		if (!rt2x00_get_field32(*reg, field))