From: Nicolas Palix <npalix@diku.dk>
To: Jean Delvare <khali@arrakis.delvare>, Paul Mackerras <paulus@samba.org>
Cc: Stelian Pop <stelian@popies.net>,
Stephen Rothwell <sfr@canb.auug.org.au>,
lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org, Julia Lawall <julia@diku.dk>,
Nicolas Palix <npalix@diku.dk>
Subject: [PATCH linux-next] hwmon/ams: Add missing of_node_put in ams-core.c
Date: Tue, 2 Dec 2008 14:48:13 +0100 [thread overview]
Message-ID: <200812021448.13543.npalix@diku.dk> (raw)
of_node_put is needed before discarding a value received from
of_find_node_by_name, eg in error handling code or when the device
node is no longer used.
The semantic match that catches the bug is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression struct device_node *n;
position p1, p2;
statement S1,S2;
expression E,E1;
expression *ptr != NULL;
@@
(
if (!(n@p1 = of_find_node_by_name(...))) S1
|
n@p1 = of_find_node_by_name(...)
)
<... when != of_node_put(n)
when != if (...) { <+... of_node_put(n) ...+> }
when != true !n || ...
when != n = E
when != E = n
if (!n || ...) S2
...>
(
return \(0\|<+...n...+>\|ptr\);
|
return@p2 ...;
|
n = E1
|
E1 = n
)
@script:python@
p1 << r.p1;
p2 << r.p2;
@@
print "* file: %s of_find_node_by_name %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/hwmon/ams/ams-core.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index 6c9ace1..e612af9 100644
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/hwmon/ams/ams-core.c
@@ -202,6 +202,7 @@ int __init ams_init(void)
if (np && of_device_is_compatible(np, "AAPL,accelerometer_1"))
/* Found I2C motion sensor */
return ams_i2c_init(np);
+ of_node_put(np);
#endif
#ifdef CONFIG_SENSORS_AMS_PMU
@@ -209,6 +210,7 @@ int __init ams_init(void)
if (np && of_device_is_compatible(np, "sms"))
/* Found PMU motion sensor */
return ams_pmu_init(np);
+ of_node_put(np);
#endif
return -ENODEV;
}
--
Nicolas Palix
next reply other threads:[~2008-12-02 13:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-02 13:48 Nicolas Palix [this message]
2008-12-02 23:30 ` Stephen Rothwell
2008-12-05 13:44 ` Nicolas Palix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200812021448.13543.npalix@diku.dk \
--to=npalix@diku.dk \
--cc=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=khali@arrakis.delvare \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=stelian@popies.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®