From ed70c6e60ee51b0fb46752ab4fd372a071da59d8 Mon Sep 17 00:00:00 2001 From: Michael Büsch Date: Fri, 7 Jan 2011 19:48:05 +0100 Subject: ssb: Ignore dangling ethernet cores on wireless devices Some Broadcom based wireless devices contain dangling ethernet cores. This triggers the ssb probing mechanism and tries to load the b44 driver on this core. Ignore the dangling core in the ssb core scanning code to avoid access to the core and failure of b44 probing. Signed-off-by: Michael Buesch Tested-by: Larry Finger Signed-off-by: John W. Linville --- drivers/ssb/scan.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 5a0985d4ce1..29884c00c4d 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c @@ -420,6 +420,16 @@ int ssb_bus_scan(struct ssb_bus *bus, bus->pcicore.dev = dev; #endif /* CONFIG_SSB_DRIVER_PCICORE */ break; + case SSB_DEV_ETHERNET: + if (bus->bustype == SSB_BUSTYPE_PCI) { + if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM && + (bus->host_pci->device & 0xFF00) == 0x4300) { + /* This is a dangling ethernet core on a + * wireless device. Ignore it. */ + continue; + } + } + break; default: break; } -- cgit v1.2.3-18-g5258