2 files changed, 10 insertions, 7 deletions

diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 522aa14e8f0d..473c415e9e25 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -557,8 +557,7 @@ static struct irq_host_ops ipic_host_ops = {
         .xlate  = ipic_host_xlate,
 };
 
-void __init ipic_init(struct device_node *node,
-                unsigned int flags)
+struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
 {
         struct ipic     *ipic;
         struct resource res;
@@ -566,7 +565,7 @@ void __init ipic_init(struct device_node *node,
 
         ipic = alloc_bootmem(sizeof(struct ipic));
         if (ipic == NULL)
-                return;
+                return NULL;
 
         memset(ipic, 0, sizeof(struct ipic));
         ipic->of_node = of_node_get(node);
@@ -576,12 +575,14 @@ void __init ipic_init(struct device_node *node,
                                        &ipic_host_ops, 0);
         if (ipic->irqhost == NULL) {
                 of_node_put(node);
-                return;
+                return NULL;
         }
 
         ret = of_address_to_resource(node, 0, &res);
-        if (ret)
-                return;
+        if (ret) {
+                of_node_put(node);
+                return NULL;
+        }
 
         ipic->regs = ioremap(res.start, res.end - res.start + 1);
 
@@ -625,6 +626,8 @@ void __init ipic_init(struct device_node *node,
 
         printk ("IPIC (%d IRQ sources) at %p\n", NR_IPIC_INTS,
                         primary_ipic->regs);
+
+        return ipic;
 }
 
 int ipic_set_priority(unsigned int virq, unsigned int priority)
diff --git a/include/asm-powerpc/ipic.h b/include/asm-powerpc/ipic.h
index 9fbb03415860..edec79dcb7c1 100644
--- a/include/asm-powerpc/ipic.h
+++ b/include/asm-powerpc/ipic.h
@@ -78,7 +78,7 @@ extern u32 ipic_get_mcp_status(void);
 extern void ipic_clear_mcp_status(u32 mask);
 
 #ifdef CONFIG_PPC_MERGE
-extern void ipic_init(struct device_node *node, unsigned int flags);
+extern struct ipic * ipic_init(struct device_node *node, unsigned int flags);
 extern unsigned int ipic_get_irq(void);
 #else
 extern void ipic_init(phys_addr_t phys_addr, unsigned int flags,