summaryrefslogtreecommitdiff
path: root/drivers/memory
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2021-01-21 01:03:59 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 10:26:14 +0100
commit75921ff8bdc492bc19be3f8a32f790aea07b7f05 (patch)
tree64427bb65ac5a127c5fdd75ae4e2ce330e8db55a /drivers/memory
parent725cb22009f7fe317be13df194b5badaab07b645 (diff)
downloadlinux-75921ff8bdc492bc19be3f8a32f790aea07b7f05.tar.gz
linux-75921ff8bdc492bc19be3f8a32f790aea07b7f05.tar.bz2
linux-75921ff8bdc492bc19be3f8a32f790aea07b7f05.zip
memory: ti-aemif: Drop child node when jumping out loop
[ Upstream commit 94e9dd43cf327366388c8f146bccdc6322c0d999 ] Call of_node_put() to decrement the reference count of the child node child_np when jumping out of the loop body of for_each_available_child_of_node(), which is a macro that increments and decrements the reference count of child node. If the loop is broken, the reference of the child node should be dropped manually. Fixes: 5a7c81547c1d ("memory: ti-aemif: introduce AEMIF driver") Signed-off-by: Pan Bian <bianpan2016@163.com> Link: https://lore.kernel.org/r/20210121090359.61763-1-bianpan2016@163.com Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/ti-aemif.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c
index db526dbf71ee..94219d2a2773 100644
--- a/drivers/memory/ti-aemif.c
+++ b/drivers/memory/ti-aemif.c
@@ -378,8 +378,10 @@ static int aemif_probe(struct platform_device *pdev)
*/
for_each_available_child_of_node(np, child_np) {
ret = of_aemif_parse_abus_config(pdev, child_np);
- if (ret < 0)
+ if (ret < 0) {
+ of_node_put(child_np);
goto error;
+ }
}
} else if (pdata && pdata->num_abus_data > 0) {
for (i = 0; i < pdata->num_abus_data; i++, aemif->num_cs++) {
@@ -405,8 +407,10 @@ static int aemif_probe(struct platform_device *pdev)
for_each_available_child_of_node(np, child_np) {
ret = of_platform_populate(child_np, NULL,
dev_lookup, dev);
- if (ret < 0)
+ if (ret < 0) {
+ of_node_put(child_np);
goto error;
+ }
}
} else if (pdata) {
for (i = 0; i < pdata->num_sub_devices; i++) {