Commit 75e89b02 authored by Julia Lawall's avatar Julia Lawall Committed by Paul Mackerras

[POWERPC] arch/powerpc/platforms/82xx: Add missing of_node_put

Of_get_parent and of_find_compatible_node do a of_node_get, and thus a
corresponding of_code_put is needed in both the error case and the normal
return case.

The problem was found using the following semantic match.
(http://www.emn.fr/x-info/coccinelle/)

// <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: default avatarJulia Lawall <julia@diku.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b1725c93
...@@ -134,13 +134,12 @@ static void __init mpc8272_ads_setup_arch(void) ...@@ -134,13 +134,12 @@ static void __init mpc8272_ads_setup_arch(void)
} }
bcsr = of_iomap(np, 0); bcsr = of_iomap(np, 0);
of_node_put(np);
if (!bcsr) { if (!bcsr) {
printk(KERN_ERR "Cannot map BCSR registers\n"); printk(KERN_ERR "Cannot map BCSR registers\n");
return; return;
} }
of_node_put(np);
clrbits32(&bcsr[1], BCSR1_RS232_EN1 | BCSR1_RS232_EN2 | BCSR1_FETHIEN); clrbits32(&bcsr[1], BCSR1_RS232_EN1 | BCSR1_RS232_EN2 | BCSR1_FETHIEN);
setbits32(&bcsr[1], BCSR1_FETH_RST); setbits32(&bcsr[1], BCSR1_FETH_RST);
......
...@@ -130,13 +130,12 @@ static void __init pq2fads_setup_arch(void) ...@@ -130,13 +130,12 @@ static void __init pq2fads_setup_arch(void)
} }
bcsr = of_iomap(np, 0); bcsr = of_iomap(np, 0);
of_node_put(np);
if (!bcsr) { if (!bcsr) {
printk(KERN_ERR "Cannot map BCSR registers\n"); printk(KERN_ERR "Cannot map BCSR registers\n");
return; return;
} }
of_node_put(np);
/* Enable the serial and ethernet ports */ /* Enable the serial and ethernet ports */
clrbits32(&bcsr[1], BCSR1_RS232_EN1 | BCSR1_RS232_EN2 | BCSR1_FETHIEN); clrbits32(&bcsr[1], BCSR1_RS232_EN1 | BCSR1_RS232_EN2 | BCSR1_FETHIEN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment