aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ozlabs.org>2011-04-11 17:25:02 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-04-27 00:18:33 -0400
commit69b123684b50040b0926eed1e02795dac8cb9587 (patch)
tree67131d99a659d68dc6e2602800ea4d0846aff46e /arch
parentd1109b7529f362c06c47140ae09dbd2b853ffddc (diff)
powerpc/pci: Properly initialize IO workaround "private"
Even when no initfunc is provided. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/io-workarounds.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/io-workarounds.c b/arch/powerpc/kernel/io-workarounds.c
index d36515eaa314..ffafaea3d261 100644
--- a/arch/powerpc/kernel/io-workarounds.c
+++ b/arch/powerpc/kernel/io-workarounds.c
@@ -175,6 +175,7 @@ void __devinit iowa_register_bus(struct pci_controller *phb,
175 bus = &iowa_busses[iowa_bus_count]; 175 bus = &iowa_busses[iowa_bus_count];
176 bus->phb = phb; 176 bus->phb = phb;
177 bus->ops = ops; 177 bus->ops = ops;
178 bus->private = data;
178 179
179 if (initfunc) 180 if (initfunc)
180 if ((*initfunc)(bus, data)) 181 if ((*initfunc)(bus, data))