Skip to contentSkip to conversation

patch "iio: adc: spmi-vadc: add missing of_node_put" added to staging-linus

PATCH [email protected] 1 participant 1 message Dec 1, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iio: adc: spmi-vadc: add missing of_node_put

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From d4c65fe4ed69a62a30a680789322ed677e3438af Mon Sep 17 00:00:00 2001

From: Julia Lawall <[email protected]>
Date: Wed, 18 Nov 2015 23:04:13 +0100
Subject: iio: adc: spmi-vadc: add missing of_node_put

for_each_available_child_of_node performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put.

A simplified version of the semantic patch that fixes this problem is as follows (http://coccinelle.lip6.fr):

// <smpl>
@@
expression root,e;
local idexpression child;
@@

for_each_available_child_of_node(root, child) {
... when != of_node_put(child)

       when != e = child

(
return child;
|
+ of_node_put(child);
? return ...;
)
...
}
// </smpl>

---
 drivers/iio/adc/qcom-spmi-vadc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/qcom-spmi-vadc.c +3 -1
index 0c4618b4d515..c2babe50a0d8 100644
@@ -839,8 +839,10 @@ static int vadc_get_dt_data(struct vadc_priv *vadc, struct device_node *node)
 
 	for_each_available_child_of_node(node, child) {
 		ret = vadc_get_dt_channel_data(vadc->dev, &prop, child);
-		if (ret)
+		if (ret) {
+			of_node_put(child);
 			return ret;
+		}
 
 		vadc->chan_props[index] = prop;
 
Signature · 1 line
2.6.2