From: Marc Zyngier <maz@misterjones.org>
Date: Fri, 14 Jul 2006 23:53:50 +0000 (-0700)
Subject: [SPARC64] Fix PSYCHO PCI controler init.
X-Git-Tag: firefly_0821_release~34123^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44;p=firefly-linux-kernel-4.4.55.git

[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>
---

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,
 	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);