b43/legacy: Fix usage of host_pci pointer
PATCH 1/1 b43/legacy: Fix usage of host_pci pointer
We must check the bustype before using the host_pci pointer.
Signed-off-by Michael Buesch <[email protected]>
---
This does not fix a bug, but is required for a future patch which puts the pointer into a union.
drivers/net/wireless/b43/main.c +2 -2
@@ -4671,7 +4671,7 @@ static int b43_wireless_core_attach(stru {struct b43_wl *wl = dev->wl;struct ssb_bus *bus = dev->dev->bus; -struct pci_dev *pdev = bus->host_pci; +struct pci_dev *pdev = (bus->bustype ==SSB_BUSTYPE_PCI ) ? bus->host_pci :NULL ;int err;bool have_2ghz_phy =0 , have_5ghz_phy =0 ;u32 tmp;
@@ -4804,7 +4804,7 @@ static int b43_one_core_attach(struct ssif (!list_empty (&wl->devlist)) {/* We are not the first core on this chip. */ - pdev = dev->bus->host_pci; + pdev = (dev->bus->bustype ==SSB_BUSTYPE_PCI ) ? dev->bus->host_pci :NULL ;/* Only special chips support more than one wireless * core, although some of the other chips have more than * one wireless core as well. Check for this and
drivers/net/wireless/b43legacy/main.c +2 -2
@@ -3592,7 +3592,7 @@ static int b43legacy_wireless_core_attac {struct b43legacy_wl *wl = dev->wl;struct ssb_bus *bus = dev->dev->bus; -struct pci_dev *pdev = bus->host_pci; +struct pci_dev *pdev = (bus->bustype ==SSB_BUSTYPE_PCI ) ? bus->host_pci :NULL ;int err;int have_bphy =0 ;int have_gphy =0 ;
@@ -3706,7 +3706,7 @@ static int b43legacy_one_core_attach(strif (!list_empty (&wl->devlist)) {/* We are not the first core on this chip. */ - pdev = dev->bus->host_pci; + pdev = (dev->bus->bustype ==SSB_BUSTYPE_PCI ) ? dev->bus->host_pci :NULL ;/* Only special chips support more than one wireless * core, although some of the other chips have more than * one wireless core as well. Check for this and
Signature · 1 line
Greetings, Michael.