aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43legacy
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-10-09 14:30:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:47:55 -0400
commit899110fe4e1b26f7a13e639c57e2a047d21bffa2 (patch)
tree7bfdb08107df98db149ad1325a3b366ef3f1b01c /drivers/net/wireless/b43legacy
parent332c556633b8c5fb4e890b1783122f2315526590 (diff)
b43/legacy: Fix usage of host_pci pointer
We must check the bustype before using the host_pci pointer. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43legacy')
-rw-r--r--drivers/net/wireless/b43legacy/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 1d9223b3d4c4..0983406f4630 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -3592,7 +3592,7 @@ static int b43legacy_wireless_core_attach(struct b43legacy_wldev *dev)
3592{ 3592{
3593 struct b43legacy_wl *wl = dev->wl; 3593 struct b43legacy_wl *wl = dev->wl;
3594 struct ssb_bus *bus = dev->dev->bus; 3594 struct ssb_bus *bus = dev->dev->bus;
3595 struct pci_dev *pdev = bus->host_pci; 3595 struct pci_dev *pdev = (bus->bustype == SSB_BUSTYPE_PCI) ? bus->host_pci : NULL;
3596 int err; 3596 int err;
3597 int have_bphy = 0; 3597 int have_bphy = 0;
3598 int have_gphy = 0; 3598 int have_gphy = 0;
@@ -3706,7 +3706,7 @@ static int b43legacy_one_core_attach(struct ssb_device *dev,
3706 3706
3707 if (!list_empty(&wl->devlist)) { 3707 if (!list_empty(&wl->devlist)) {
3708 /* We are not the first core on this chip. */ 3708 /* We are not the first core on this chip. */
3709 pdev = dev->bus->host_pci; 3709 pdev = (dev->bus->bustype == SSB_BUSTYPE_PCI) ? dev->bus->host_pci : NULL;
3710 /* Only special chips support more than one wireless 3710 /* Only special chips support more than one wireless
3711 * core, although some of the other chips have more than 3711 * core, although some of the other chips have more than
3712 * one wireless core as well. Check for this and 3712 * one wireless core as well. Check for this and