Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

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) },