target/linux/generic/patches-3.12/025-bcma_backport.patch

   1 --- a/drivers/bcma/host_pci.c
   2 +++ b/drivers/bcma/host_pci.c
   3 @@ -188,8 +188,11 @@ static int bcma_host_pci_probe(struct pc
   4                 pci_write_config_dword(dev, 0x40, val & 0xffff00ff);
   5
   6         /* SSB needed additional powering up, do we have any AMBA PCI cards? */
   7 -       if (!pci_is_pcie(dev))
   8 -               bcma_err(bus, "PCI card detected, report problems.\n");
   9 +       if (!pci_is_pcie(dev)) {
  10 +               bcma_err(bus, "PCI card detected, they are not supported.\n");
  11 +               err = -ENXIO;
  12 +               goto err_pci_release_regions;
  13 +       }
  14
  15         /* Map MMIO */
  16         err = -ENOMEM;
  17 @@ -269,6 +272,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bc
  18
  19  static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
  20         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
  21 +       { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },
  22         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },
  23         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
  24         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },