Commit ee7022dc authored by Marc Zyngier's avatar Marc Zyngier Committed by David S. Miller

[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: default avatarMarc Zyngier <maz@misterjones.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4926158
...@@ -1200,12 +1200,13 @@ static void psycho_pbm_init(struct pci_controller_info *p, ...@@ -1200,12 +1200,13 @@ static void psycho_pbm_init(struct pci_controller_info *p,
pbm->io_space.flags = IORESOURCE_IO; pbm->io_space.flags = IORESOURCE_IO;
pbm->mem_space.end = pbm->mem_space.start + PSYCHO_MEMSPACE_SIZE; pbm->mem_space.end = pbm->mem_space.start + PSYCHO_MEMSPACE_SIZE;
pbm->mem_space.flags = IORESOURCE_MEM; pbm->mem_space.flags = IORESOURCE_MEM;
pbm_register_toplevel_resources(p, pbm);
pbm->parent = p; pbm->parent = p;
pbm->prom_node = dp; pbm->prom_node = dp;
pbm->name = dp->full_name; pbm->name = dp->full_name;
pbm_register_toplevel_resources(p, pbm);
printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n", printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n",
pbm->name, pbm->name,
pbm->chip_version, pbm->chip_revision); pbm->chip_version, pbm->chip_revision);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment