aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc64
diff options
context:
space:
mode:
authorMarc Zyngier <maz@misterjones.org>2006-07-14 16:53:50 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-07-14 17:00:30 -0700
commitee7022dcfbf660727d6b8553cb0dbc0d4eae8f44 (patch)
tree9bc2d63a6a94376ddf34881b56295f9e8eb33f6d /arch/sparc64
parenta49261585e2c89f16b5a4bb80f623d2e9c2c1566 (diff)
[SPARC64] Fix PSYCHO PCI controler init.
pbm->name should be initialized before calling pbm_register_toplevel_resources. Move the call a few lines down to avoid a nice Oops. Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/pci_psycho.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 83f88ad4ffa..1ec0aab68c0 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1200,12 +1200,13 @@ static void psycho_pbm_init(struct pci_controller_info *p,
pbm->io_space.flags = IORESOURCE_IO;
pbm->mem_space.end = pbm->mem_space.start + PSYCHO_MEMSPACE_SIZE;
pbm->mem_space.flags = IORESOURCE_MEM;
- pbm_register_toplevel_resources(p, pbm);
pbm->parent = p;
pbm->prom_node = dp;
pbm->name = dp->full_name;
+ pbm_register_toplevel_resources(p, pbm);
+
printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n",
pbm->name,
pbm->chip_version, pbm->chip_revision);