Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a81b7f authored by Julia Lawall's avatar Julia Lawall Committed by Linus Walleij
Browse files

pinctrl: rockchip: add missing of_node_put 

for_each_child_of_node performs an of_node_get on each iteration, so a
return from 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>
@@
local idexpression n;
expression e,e1;
@@

 for_each_child_of_node(e1,n) {
   ...
(
   of_node_put(n);
|
   e = n
|
   return n;
|
+  of_node_put(n);
?  return ...;
)
   ...
 }
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d0b3ed41

drivers/pinctrl/pinctrl-rockchip.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1292,9 +1292,11 @@ static int rockchip_pinctrl_parse_functions(struct device_node *np, 
		func->groups[i] = child->name;

		func->groups[i] = child->name;

		grp = &info->groups[grp_index++];

		grp = &info->groups[grp_index++];

		ret = rockchip_pinctrl_parse_groups(child, grp, info, i++);

		ret = rockchip_pinctrl_parse_groups(child, grp, info, i++);

		if (ret)

		if (ret) {

			of_node_put(child);

			return ret;

			return ret;

		}

		}

	}





	return 0;

	return 0;

}

}
@@ -1338,6 +1340,7 @@ static int rockchip_pinctrl_parse_dt(struct platform_device *pdev, 
		ret = rockchip_pinctrl_parse_functions(child, info, i++);

		ret = rockchip_pinctrl_parse_functions(child, info, i++);

		if (ret) {

		if (ret) {

			dev_err(&pdev->dev, "failed to parse function\n");

			dev_err(&pdev->dev, "failed to parse function\n");

			of_node_put(child);

			return ret;

			return ret;

		}

		}

	}

	}