]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/powerpc/sysdev/mpc8xx_pic.c
OMAP1: clock: Typo fix for clock in omap1
[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / mpc8xx_pic.c
index 7aa4ff5f5ec8fff069d3805aecce7f0a1eacc5f5..5d2d5522ef416846a0ba9bf8073c05652227d4c7 100644 (file)
@@ -10,7 +10,6 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/8xx_immap.h>
-#include <asm/mpc8xx.h>
 
 #include "mpc8xx_pic.h"
 
@@ -175,15 +174,19 @@ int mpc8xx_pic_init(void)
                goto out;
 
        siu_reg = ioremap(res.start, res.end - res.start + 1);
-       if (siu_reg == NULL)
-               return -EINVAL;
+       if (siu_reg == NULL) {
+               ret = -EINVAL;
+               goto out;
+       }
 
-       mpc8xx_pic_host = irq_alloc_host(of_node_get(np), IRQ_HOST_MAP_LINEAR,
+       mpc8xx_pic_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR,
                                         64, &mpc8xx_pic_host_ops, 64);
        if (mpc8xx_pic_host == NULL) {
                printk(KERN_ERR "MPC8xx PIC: failed to allocate irq host!\n");
                ret = -ENOMEM;
+               goto out;
        }
+       return 0;
 
 out:
        of_node_put(np);