diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-11 11:34:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-11 11:34:06 -0700 |
| commit | 14599f1e341ee219abdd15f4eee5872d6f2d29f1 (patch) | |
| tree | 3875181429010e58416ab34e6c06ef42de52e756 /drivers/net/wireless/hostap | |
| parent | d8d1f30b95a635dbd610dcc5eb641aca8f4768cf (diff) | |
| parent | 832c10fd733893f86c63bde1c65b005d5a2fe346 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/hostap')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index d7073281942..ff9b5c88218 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -2618,15 +2618,6 @@ 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; |