diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-14 14:35:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-14 14:35:41 -0500 |
| commit | 5d22df200beccb1dea26fe4d8684ed93ae2f0aeb (patch) | |
| tree | 05220b08a0c9d170ad88e3b9ed0390750d22d8ea /drivers/ssb | |
| parent | 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 (diff) | |
| parent | 78feb35b8161acd95c33a703ed6ab6f554d29387 (diff) | |
| download | linux-5d22df200beccb1dea26fe4d8684ed93ae2f0aeb.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/driver_pcicore.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 84c934c0a545..520e8286db28 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c @@ -517,10 +517,14 @@ static void ssb_pcicore_pcie_setup_workarounds(struct ssb_pcicore *pc) static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) { - ssb_pcicore_fix_sprom_core_index(pc); + struct ssb_device *pdev = pc->dev; + struct ssb_bus *bus = pdev->bus; + + if (bus->bustype == SSB_BUSTYPE_PCI) + ssb_pcicore_fix_sprom_core_index(pc); /* Disable PCI interrupts. */ - ssb_write32(pc->dev, SSB_INTVEC, 0); + ssb_write32(pdev, SSB_INTVEC, 0); /* Additional PCIe always once-executed workarounds */ if (pc->dev->id.coreid == SSB_DEV_PCIE) { |