aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-07-13 14:06:32 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-14 13:49:46 -0400
commit0f4da2d77e1bf424ac36424081afc22cbfc3ff2b (patch)
tree04e40fdb0513f18642c8d20499d207ff1b297b81
parentath9k_htc: fix memory leak in ath9k_hif_usb_alloc_urbs (diff)
downloadlinux-dev-0f4da2d77e1bf424ac36424081afc22cbfc3ff2b.tar.xz
linux-dev-0f4da2d77e1bf424ac36424081afc22cbfc3ff2b.zip
hostap_pci: set dev->base_addr during probe
"hostap: Protect against initialization interrupt" (which reinstated "wireless: hostap, fix oops due to early probing interrupt") reintroduced Bug 16111. This is because hostap_pci wasn't setting dev->base_addr, which is now checked in prism2_interrupt. As a result, initialization was failing for PCI-based hostap devices. This corrects that oversight. Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/hostap/hostap_pci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index d24dc7dc0723..972a9c3af39e 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -330,6 +330,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,
dev->irq = pdev->irq;
hw_priv->mem_start = mem;
+ dev->base_addr = (unsigned long) mem;
prism2_pci_cor_sreset(local);