From: Amitoj Kaur Chawla <amitoj1606@gmail.com>
To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: julia.lawall@lip6.fr
Subject: [PATCH] input: keyboard: cap11xx: Add missing of_node_put
Date: Mon, 25 Jan 2016 21:01:21 +0530 [thread overview]
Message-ID: <20160125153121.GA21093@amitoj-Inspiron-3542> (raw)
for_each_child_of_node performs an of_node_get on each iteration, so
to break out of the loop an of_node_put is required.
Found using Coccinelle. The semantic patch used for this is as follows:
// <smpl>
@@
expression e;
local idexpression n;
@@
for_each_child_of_node(..., n) {
... when != of_node_put(n)
when != e = n
(
return n;
|
+ of_node_put(n);
? return ...;
)
...
}
// </smpl
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
---
drivers/input/keyboard/cap11xx.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
index 378db10..27cd7df 100644
--- a/drivers/input/keyboard/cap11xx.c
+++ b/drivers/input/keyboard/cap11xx.c
@@ -304,8 +304,10 @@ static int cap11xx_init_leds(struct device *dev,
led->cdev.brightness = LED_OFF;
error = of_property_read_u32(child, "reg", ®);
- if (error != 0 || reg >= num_leds)
- return -EINVAL;
+ if (error != 0 || reg >= num_leds) {
+ error = -EINVAL;
+ goto putchild;
+ }
led->reg = reg;
led->priv = priv;
@@ -314,13 +316,17 @@ static int cap11xx_init_leds(struct device *dev,
error = devm_led_classdev_register(dev, &led->cdev);
if (error)
- return error;
+ goto putchild;
priv->num_leds++;
led++;
}
return 0;
+
+putchild:
+ of_node_put(child);
+ return error;
}
#else
static int cap11xx_init_leds(struct device *dev,
--
1.9.1
next reply other threads:[~2016-01-25 15:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 15:31 Amitoj Kaur Chawla [this message]
2016-01-27 23:48 ` [PATCH] input: keyboard: cap11xx: Add missing of_node_put Dmitry Torokhov
2016-01-28 9:16 ` Julia Lawall
2016-01-28 18:51 ` Dmitry Torokhov
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=20160125153121.GA21093@amitoj-Inspiron-3542 \
--to=amitoj1606@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=julia.lawall@lip6.fr \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).