diff options
author | Grant Grundler <grundler@parisc-linux.org> | 2009-01-28 22:30:55 -0700 |
---|---|---|
committer | Kyle McMartin <kyle@treachery.i.cabal.ca> | 2009-03-13 01:19:12 -0400 |
commit | 9785d646c10b0707412516ffe56b71b9eb18861f (patch) | |
tree | 1886076d2eff28dd97fa03a4df3d1a3ae76f43a6 /drivers/parisc/lba_pci.c | |
parent | c1da90fd099531e9449019dc53a5a02a5eaef2b4 (diff) | |
download | linux-9785d646c10b0707412516ffe56b71b9eb18861f.tar.gz linux-9785d646c10b0707412516ffe56b71b9eb18861f.tar.bz2 linux-9785d646c10b0707412516ffe56b71b9eb18861f.zip |
parisc: fix wrong assumption about bus->self
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> posted a patch series
to linux-pci to fix a wrong assumption about pci_bus->self==NULL for
all PCI host bus controllers. While PARISC platforms to not behave
this way, I prefer to have the code consistent across architectures.
The following patch replaces pci_bus->self with pci_bus->parent when
used as a test to check for "root bus controller".
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'drivers/parisc/lba_pci.c')
-rw-r--r-- | drivers/parisc/lba_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index d8233de8c75d..59fbbf128365 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -644,7 +644,7 @@ lba_fixup_bus(struct pci_bus *bus) ** Properly Setup MMIO resources for this bus. ** pci_alloc_primary_bus() mangles this. */ - if (bus->self) { + if (bus->parent) { int i; /* PCI-PCI Bridge */ pci_read_bridge_bases(bus); @@ -802,7 +802,7 @@ lba_fixup_bus(struct pci_bus *bus) ** Can't fixup here anyway....garr... */ if (fbb_enable) { - if (bus->self) { + if (bus->parent) { u8 control; /* enable on PPB */ (void) pci_read_config_byte(bus->self, PCI_BRIDGE_CONTROL, &control); |