summaryrefslogtreecommitdiffstats
path: root/drivers/ssb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-08 16:30:17 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-08 16:30:17 -0700
commit7c3ceb4a409e2b838700edf081d61a8a4c921e79 (patch)
tree4dbf54cc23d2796b278e22fc6f5460b9b451c956 /drivers/ssb
parent54dceb008ffcbe003bea9017cad1227a83b6fc3f (diff)
parentb2238566401f01eb796e75750213c7b0fce396b2 (diff)
downloadop-kernel-dev-7c3ceb4a409e2b838700edf081d61a8a4c921e79.zip
op-kernel-dev-7c3ceb4a409e2b838700edf081d61a8a4c921e79.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-3945.c net/mac80211/mlme.c
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/driver_pcicore.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index d28c538..538c570 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -537,6 +537,13 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
int err = 0;
u32 tmp;
+ if (dev->bus->bustype != SSB_BUSTYPE_PCI) {
+ /* This SSB device is not on a PCI host-bus. So the IRQs are
+ * not routed through the PCI core.
+ * So we must not enable routing through the PCI core. */
+ goto out;
+ }
+
if (!pdev)
goto out;
bus = pdev->bus;
OpenPOWER on IntegriCloud