diff options
author | Marc Zyngier <maz@misterjones.org> | 2006-07-14 19:53:50 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-14 20:00:30 -0400 |
commit | ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44 (patch) | |
tree | 9bc2d63a6a94376ddf34881b56295f9e8eb33f6d | |
parent | a49261585e2c89f16b5a4bb80f623d2e9c2c1566 (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>
-rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 83f88ad4ffa5..1ec0aab68c08 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, | |||
1200 | pbm->io_space.flags = IORESOURCE_IO; | 1200 | pbm->io_space.flags = IORESOURCE_IO; |
1201 | pbm->mem_space.end = pbm->mem_space.start + PSYCHO_MEMSPACE_SIZE; | 1201 | pbm->mem_space.end = pbm->mem_space.start + PSYCHO_MEMSPACE_SIZE; |
1202 | pbm->mem_space.flags = IORESOURCE_MEM; | 1202 | pbm->mem_space.flags = IORESOURCE_MEM; |
1203 | pbm_register_toplevel_resources(p, pbm); | ||
1204 | 1203 | ||
1205 | pbm->parent = p; | 1204 | pbm->parent = p; |
1206 | pbm->prom_node = dp; | 1205 | pbm->prom_node = dp; |
1207 | pbm->name = dp->full_name; | 1206 | pbm->name = dp->full_name; |
1208 | 1207 | ||
1208 | pbm_register_toplevel_resources(p, pbm); | ||
1209 | |||
1209 | printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n", | 1210 | printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n", |
1210 | pbm->name, | 1211 | pbm->name, |
1211 | pbm->chip_version, pbm->chip_revision); | 1212 | pbm->chip_version, pbm->chip_revision); |