diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-01 00:12:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-19 21:53:03 +0200 |
| commit | 2b4766c3008aa99a60415a6f321ac0dad94852f1 (patch) | |
| tree | 95c4600f0f5baddf2b5761341cc568a1dcf17b52 | |
| parent | ath/ath9k/ar9003_eeprom.c: Remove semicolon after if (diff) | |
| download | linux-2b4766c3008aa99a60415a6f321ac0dad94852f1.tar.xz linux-2b4766c3008aa99a60415a6f321ac0dad94852f1.zip | |
bcma: do not initialize deactivated PCIe cores
Before it was tried to initialize the deactivated PCIe core in client
mode, but this causes the SoC to hang. Just do not initialize it at all
and ignore the core it is not working and nothing is connected to it
when the specific bit is set in the boardflags.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/bcma/driver_pci_host.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c index 63172c9f871a..e56449506695 100644 --- a/drivers/bcma/driver_pci_host.c +++ b/drivers/bcma/driver_pci_host.c @@ -35,11 +35,6 @@ bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc) chipid_top != 0x5300) return false; - if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) { - bcma_info(bus, "This PCI core is disabled and not working\n"); - return false; - } - bcma_core_enable(pc->core, 0); return !mips_busprobe32(tmp, pc->core->io_addr); @@ -396,6 +391,11 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) bcma_info(bus, "PCIEcore in host mode found\n"); + if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) { + bcma_info(bus, "This PCIE core is disabled and not working\n"); + return; + } + pc_host = kzalloc(sizeof(*pc_host), GFP_KERNEL); if (!pc_host) { bcma_err(bus, "can not allocate memory"); |