---

yaml --- r: 75331 b: refs/heads/master c: 87c4ac8 h: refs/heads/master i: 75329: 2181002 75327: 759a1ac v: v3
git-mirror · Jan 9, 2008 · f581818 · f581818
1 parent 989ab62
commit f581818
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ec2411980d0fd2995e8dea8a06fe57aa47523cb
+refs/heads/master: 87c4ac841c1d524416ab36c19689550bf302dab1
diff --git a/trunk/drivers/ssb/scan.c b/trunk/drivers/ssb/scan.c
@@ -388,6 +388,17 @@ int ssb_bus_scan(struct ssb_bus *bus,
 		case SSB_DEV_PCI:
 		case SSB_DEV_PCIE:
 #ifdef CONFIG_SSB_DRIVER_PCICORE
+			if (bus->bustype == SSB_BUSTYPE_PCI) {
+				/* Ignore PCI cores on PCI-E cards.
+				 * Ignore PCI-E cores on PCI cards. */
+				if (dev->id.coreid == SSB_DEV_PCI) {
+					if (bus->host_pci->is_pcie)
+						continue;
+				} else {
+					if (!bus->host_pci->is_pcie)
+						continue;
+				}
+			}
 			if (bus->pcicore.dev) {
 				ssb_printk(KERN_WARNING PFX
 					   "WARNING: Multiple PCI(E) cores found\n");