From 4be5f7a1fc3d26ae6e6252b77a68c41b28a8083a Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Sun, 30 Aug 2009 20:18:41 -0600
Subject: [PATCH] --- yaml --- r: 183247 b: refs/heads/master c:
 15920d8afc87861672e16fa95ae2764b065d6dd3 h: refs/heads/master i:   183245:
 4519a88dbd900df49346625c508ce560092a8186   183243:
 c98c28726ce20b9feaf065c81393af1bea8dc842   183239:
 0177349db8e0094c4f95e9fe3ed0b94c010e3897   183231:
 b4508de537134e4aa5c9094485ab961460a4835b v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/hostap/hostap_hw.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c3752b8b797c..60482034b38d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 254416aae70ab2e6b57fd79782c8a67196234d02
+refs/heads/master: 15920d8afc87861672e16fa95ae2764b065d6dd3
diff --git a/trunk/drivers/net/wireless/hostap/hostap_hw.c b/trunk/drivers/net/wireless/hostap/hostap_hw.c
index ff9b5c882184..d70732819423 100644
--- a/trunk/drivers/net/wireless/hostap/hostap_hw.c
+++ b/trunk/drivers/net/wireless/hostap/hostap_hw.c
@@ -2618,6 +2618,15 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
 	int events = 0;
 	u16 ev;
 
+	/* Detect early interrupt before driver is fully configued */
+	if (!dev->base_addr) {
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: Interrupt, but dev not configured\n",
+			       dev->name);
+		}
+		return IRQ_HANDLED;
+	}
+
 	iface = netdev_priv(dev);
 	local = iface->local;