summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorTang Yuantian <yuantian.tang@freescale.com>2013-04-10 07:36:39 +0400
committerGrant Likely <grant.likely@linaro.org>2013-04-17 18:53:12 +0400
commitb855f16b05a697ac1863adabe99bfba56e6d3199 (patch)
tree881f7a861790c977ad6d645bf2928b72a15d4d20 /drivers/of
parent48d045dbe9c757681edfe8274211254c56d53a41 (diff)
downloadlinux-b855f16b05a697ac1863adabe99bfba56e6d3199.tar.xz
of/base: release the node correctly in of_parse_phandle_with_args()
Call of_node_put() only when the out_args is NULL on success, or the node's reference count will not be correct because the caller will call of_node_put() again. Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> [grant.likely: tightened up the patch] Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 321d3ef05006..e77e71989e81 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1166,11 +1166,11 @@ static int __of_parse_phandle_with_args(const struct device_node *np,
out_args->args_count = count;
for (i = 0; i < count; i++)
out_args->args[i] = be32_to_cpup(list++);
+ } else {
+ of_node_put(node);
}
/* Found it! return success */
- if (node)
- of_node_put(node);
return 0;
}