summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-04-29 02:50:43 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-05-16 12:45:26 -0400
commit22291cea073d342109a527055dabcf7edef8fa7c (patch)
treee5da52cf9f28ee591236eea815d13f3641672dd4 /drivers/net
parenta06f2109917e19f41af4d19144ce993247b4eff2 (diff)
downloadlinux-22291cea073d342109a527055dabcf7edef8fa7c.tar.gz
linux-22291cea073d342109a527055dabcf7edef8fa7c.tar.xz
linux-22291cea073d342109a527055dabcf7edef8fa7c.zip
brcmsmac: handle non pci in ai_deviceremoved()
This is based on code from the Broadcom SDK. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Tested-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/aiutils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index dd4698df6dad..6d8b7213643a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -816,6 +816,9 @@ bool ai_deviceremoved(struct si_pub *sih)
sii = (struct si_info *)sih;
+ if (sii->icbus->hosttype != BCMA_HOSTTYPE_PCI)
+ return false;
+
pci_read_config_dword(sii->pcibus, PCI_VENDOR_ID, &w);
if ((w & 0xFFFF) != PCI_VENDOR_ID_BROADCOM)
return true;