Skip to content

Commit

Permalink
[POWERPC] Add missing of_node_put in drivers/macintosh/smu.c
Browse files Browse the repository at this point in the history
of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.

The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@

n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
    when != n1 = f1(n,...)
    when != E1 = n
    when any
    when strict
(
+ of_node_put(n);
  return -C;
|
  of_node_put(n);
|
  n2 = f2(n,...)
|
  E2 = n
|
  return ...;
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Julia Lawall authored and Paul Mackerras committed Jun 16, 2008
1 parent bad5232 commit 8b9dba2
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/macintosh/smu.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,15 @@ int __init smu_init (void)

if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer not allocated !\n");
of_node_put(np);
return -EINVAL;
}

smu = alloc_bootmem(sizeof(struct smu_device));
if (smu == NULL)
if (smu == NULL) {
of_node_put(np);
return -ENOMEM;
}
memset(smu, 0, sizeof(*smu));

spin_lock_init(&smu->lock);
Expand Down

0 comments on commit 8b9dba2

Please sign in to comment.