diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-17 14:02:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-17 14:02:07 -0400 |
| commit | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch) | |
| tree | 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /drivers/bcma | |
| parent | ccdbb6e96beca362db876d820ac1e560ff6d9579 (diff) | |
| parent | b6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff) | |
| download | blackbird-op-linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.gz blackbird-op-linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/host_pci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index a355e63a3838..6fb98b53533f 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c @@ -188,8 +188,11 @@ static int bcma_host_pci_probe(struct pci_dev *dev, pci_write_config_dword(dev, 0x40, val & 0xffff00ff); /* SSB needed additional powering up, do we have any AMBA PCI cards? */ - if (!pci_is_pcie(dev)) - bcma_err(bus, "PCI card detected, report problems.\n"); + if (!pci_is_pcie(dev)) { + bcma_err(bus, "PCI card detected, they are not supported.\n"); + err = -ENXIO; + goto err_pci_release_regions; + } /* Map MMIO */ err = -ENOMEM; @@ -269,6 +272,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) }, |
