diff options
| author | Hauke Mehrtens | 2012-04-29 02:50:43 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-05-16 18:45:26 +0200 |
| commit | 22291cea073d342109a527055dabcf7edef8fa7c (patch) | |
| tree | e5da52cf9f28ee591236eea815d13f3641672dd4 /drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | |
| parent | brcmsmac: read PCI vendor and device id only for PCI devices (diff) | |
| download | kernel-qcow2-linux-22291cea073d342109a527055dabcf7edef8fa7c.tar.gz kernel-qcow2-linux-22291cea073d342109a527055dabcf7edef8fa7c.tar.xz kernel-qcow2-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/wireless/brcm80211/brcmsmac/aiutils.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 3 |
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; |