[PATCH 4/4] drivers/macintosh/therm_adt746x.c: add missing of_node_put

2008-06-09 Thread Julia Lawall
From: Julia Lawall [EMAIL PROTECTED]

of_node_put is needed before discarding a value received from
of_find_node_by_name, 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;
statement S;
identifier f;
expression E;
constant C;
@@

n = of_find_node_by_name(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f(n,...)
when != E = n
when any
when strict
(
+ of_node_put(n);
  return -C;
|
  of_node_put(n);
|
  n1 = f(n,...)
|
  E = n
|
  return ...;
)
// /smpl

Signed-off-by: Julia Lawall [EMAIL PROTECTED]

---

diff -u -p a/drivers/macintosh/therm_adt746x.c 
b/drivers/macintosh/therm_adt746x.c
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -562,18 +562,24 @@ thermostat_init(void)
therm_type = ADT7460;
else if (of_device_is_compatible(np, adt7467))
therm_type = ADT7467;
-   else
+   else {
+   of_node_put(np);
return -ENODEV;
+   }
 
prop = of_get_property(np, hwsensor-params-version, NULL);
printk(KERN_INFO adt746x: version %d (%ssupported)\n, *prop,
 (*prop == 1)?:un);
-   if (*prop != 1)
+   if (*prop != 1) {
+   of_node_put(np);
return -ENODEV;
+   }
 
prop = of_get_property(np, reg, NULL);
-   if (!prop)
+   if (!prop) {
+   of_node_put(np);
return -ENODEV;
+   }
 
/* look for bus either by path or using reg */
if (strstr(np-full_name, /i2c-bus@) != NULL) {
@@ -610,5 +616,6 @@ thermostat_init(void)

if (of_dev == NULL) {
printk(KERN_ERR Can't register temperatures device !\n);
+   of_node_put(np);
return -ENODEV;
}
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Re: [PATCH 4/4] drivers/macintosh/therm_adt746x.c: add missing of_node_put

2008-06-09 Thread Stephen Rothwell
On Mon, 9 Jun 2008 14:21:51 +0200 (CEST) Julia Lawall [EMAIL PROTECTED] wrote:

 From: Julia Lawall [EMAIL PROTECTED]
 
 of_node_put is needed before discarding a value received from
 of_find_node_by_name, 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;
 statement S;
 identifier f;
 expression E;
 constant C;
 @@
 
 n = of_find_node_by_name(...)
 ...
 if (!n) S
 ... when != of_node_put(n)
 when != n1 = f(n,...)
 when != E = n
 when any
 when strict
 (
 + of_node_put(n);
   return -C;
 |
   of_node_put(n);
 |
   n1 = f(n,...)
 |
   E = n
 |
   return ...;
 )
 // /smpl
 
 Signed-off-by: Julia Lawall [EMAIL PROTECTED]

Acked-by: Stephen Rothwell [EMAIL PROTECTED]

-- 
Cheers,
Stephen Rothwell[EMAIL PROTECTED]
http://www.canb.auug.org.au/~sfr/


pgpsYaWE3r82Q.pgp
Description: PGP signature
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev