aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-12 22:29:36 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:12:35 -0800
commit0b522497a176f222ae4cf7e6733a5357352224b2 (patch)
treea65db8c8c97e8f8e760f802dc3a59c38765a7517 /arch
parentc26092675020ff495a16dd635bf1733215325540 (diff)
downloadlinux-0b522497a176f222ae4cf7e6733a5357352224b2.tar.gz
[SPARC64]: Missing 'return' statement in sun4v_pci_init().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/pci_sun4v.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 59e660d849ab1..7055616e08394 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -916,8 +916,10 @@ void sun4v_pci_init(int node, char *model_name)
&p->pbm_A :
&p->pbm_B);
- if (pbm->devhandle == (devhandle ^ 0x40))
+ if (pbm->devhandle == (devhandle ^ 0x40)) {
pci_sun4v_pbm_init(p, node, devhandle);
+ return;
+ }
}
p = kmalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
@@ -961,7 +963,4 @@ void sun4v_pci_init(int node, char *model_name)
pci_memspace_mask = 0x7fffffffUL;
pci_sun4v_pbm_init(p, node, devhandle);
-
- prom_printf("sun4v_pci_init: Implement me.\n");
- prom_halt();
}