]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[SPARC64]: Missing 'return' statement in sun4v_pci_init().
authorDavid S. Miller <davem@sunset.davemloft.net>
Mon, 13 Feb 2006 06:29:36 +0000 (22:29 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 20 Mar 2006 09:12:35 +0000 (01:12 -0800)
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/pci_sun4v.c

index 59e660d849ab182b86ecf707d4fa9040af6f3a89..7055616e0839486958f15c3e9e9ecbdc045d4a4f 100644 (file)
@@ -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();
 }