summaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-03 13:49:09 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-10-10 19:46:00 +0200
commitdfa0415bcbc606bd20c63d3119ed00839280690a (patch)
treea139a5427a6b7d839bb10fd2d965c67b6e6ae80c /drivers/bcma
parentnet: wireless: wl1251: update firmware path (diff)
downloadlinux-dfa0415bcbc606bd20c63d3119ed00839280690a.tar.xz
linux-dfa0415bcbc606bd20c63d3119ed00839280690a.zip
bcma: reject PCI cards in bcma.
bcma currently only supports PCIe cards and no PCI cards, reject them if we find them. I have never heard of any PCI card using the AI bus (bcma), all of them are using ssb instead. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma')
-rw-r--r--drivers/bcma/host_pci.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index a355e63a3838..a1caf9c5b132 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;