Commit:     b1725c9319aae42d7bd1159fc99e033d5a3076f8
Parent:     842decbd674106d63a67e07a2f8cec5af70fdb40
Author:     Julia Lawall <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 23:34:59 2008 -0800
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Feb 6 22:06:59 2008 +1100

    [POWERPC] arch/powerpc/sysdev: Add missing of_node_put
    The functions of_find_compatible_node and of_find_node_by_type both
    call of_node_get on their result.  So any error handling code
    thereafter should call of_node_put(np).  This is taken care of in the
    case where there is a goto out, but not when there is a direct return.
    The function irq_alloc_host puts np into the returned structure, which is
    stored in the global variable mpc8xx_pic_host, so the reference count
    should be set for the lifetime of that variable.  The current solution ups
    the reference count again in the argument to irq_alloc_host so that it can
    be decremented on the way out.  This seems a bit unnecessary, and also
    doesn't work in the case where irq_alloc_host fails, because then the
    reference count only goes does by one, whereas it should go down by two.  A
    better solution is to not increment the reference count in the argument to
    irq_alloc_host and only decrement it on the way out in an error case.
    The problem was found using the following semantic match.
    // <smpl>
    type T,T1,T2;
    identifier E;
    statement S;
    expression x1,x2,x3;
    int ret;
      T E;
    * E = \(of_get_parent\|of_find_compatible_node\)(...);
      if (E == NULL) S
      ... when != of_node_put(...,(T1)E,...)
          when != if (E != NULL) { ... of_node_put(...,(T1)E,...); ...}
          when != x1 = (T1)E
          when != E = x3;
          when any
      if (...) {
        ... when != of_node_put(...,(T2)E,...)
            when != if (E != NULL) { ... of_node_put(...,(T2)E,...); ...}
            when != x2 = (T2)E
    *   return;
    *   return ret;
    // </smpl>
    Signed-off-by: Julia Lawall <[EMAIL PROTECTED]>
    Cc: Stephen Rothwell <[EMAIL PROTECTED]>
    Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    Cc: Kumar Gala <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/sysdev/mpc8xx_pic.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index 0e74a4b..5d2d552 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -174,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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to