From: Michael Reeves <[email protected]> The devinfo->coreid field is never assigned, so bus->chip remains zero and chip-specific feature checks cannot match. Assign bus->chip from devinfo->ci->chip, which contains the detected chip ID.
Signed-off-by: Michael Reeves <[email protected]> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 55f4d7b970..5d84526c96 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -342,7 +342,6 @@ struct brcmf_pciedev_info { u32 ram_base; u32 ram_size; struct brcmf_chip *ci; - u32 coreid; struct brcmf_pcie_shared_info shared; wait_queue_head_t mbdata_resp_wait; bool mbdata_completed; @@ -2518,7 +2517,7 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) bus->bus_priv.pcie = pcie_bus_dev; bus->ops = &brcmf_pcie_bus_ops; bus->proto_type = BRCMF_PROTO_MSGBUF; - bus->chip = devinfo->coreid; + bus->chip = devinfo->ci->chip; bus->wowl_supported = pci_pme_capable(pdev, PCI_D3hot); bus->fwvid = drvdata[id->driver_data].vendor; devinfo->fwseed = drvdata[id->driver_data].fw_seed; -- 2.55.0
