[brcm47xx]: bcma: do not initialize deactivated PCIe cores
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.3 / 204-bcma-do-not-initialize-deactivated-PCIe-cores.patch
1 --- a/drivers/bcma/driver_pci_host.c
2 +++ b/drivers/bcma/driver_pci_host.c
3 @@ -35,11 +35,6 @@ bool __devinit bcma_core_pci_is_in_hostm
4 chipid_top != 0x5300)
5 return false;
6
7 - if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) {
8 - bcma_info(bus, "This PCI core is disabled and not working\n");
9 - return false;
10 - }
11 -
12 bcma_core_enable(pc->core, 0);
13
14 return !mips_busprobe32(tmp, pc->core->io_addr);
15 @@ -396,6 +391,11 @@ void __devinit bcma_core_pci_hostmode_in
16
17 bcma_info(bus, "PCIEcore in host mode found\n");
18
19 + if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) {
20 + bcma_info(bus, "This PCIE core is disabled and not working\n");
21 + return;
22 + }
23 +
24 pc_host = kzalloc(sizeof(*pc_host), GFP_KERNEL);
25 if (!pc_host) {
26 bcma_err(bus, "can not allocate memory");