summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2013-06-10 17:26:39 -0400
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:00:51 +0900
commitc30b5aa258374273ed1c4ee0d203a5404adc9c0b (patch)
treea29e9651bfa60604ed86961669a23851301d5167 /drivers/power
parent3248021be5d43d6e6d1ef0fd8f78b2bf32cc3891 (diff)
downloadlinux-3.10-c30b5aa258374273ed1c4ee0d203a5404adc9c0b.tar.gz
linux-3.10-c30b5aa258374273ed1c4ee0d203a5404adc9c0b.tar.bz2
linux-3.10-c30b5aa258374273ed1c4ee0d203a5404adc9c0b.zip
power_supply: Add of_node_put to fix refcount
of_parse_phandle increments the refcount for a dt node before returning it. Add of_node_put where needed to properly decrement the refcount when we are done using a given node. Change-Id: I49584e6d17ba5cc7f431a8a0b193fcbc2b6a2f34 Signed-off-by: Rhyland Klein <rklein@nvidia.com> Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/power_supply_core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 1c517c34e4b..3b2d5df45e7 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -109,8 +109,10 @@ static int __power_supply_populate_supplied_from(struct device *dev,
psy->name, epsy->name);
psy->supplied_from[i-1] = (char *)epsy->name;
psy->num_supplies++;
+ of_node_put(np);
break;
}
+ of_node_put(np);
} while (np);
return 0;
@@ -193,8 +195,10 @@ static int power_supply_check_supplies(struct power_supply *psy)
ret = power_supply_find_supply_from_node(np);
if (ret) {
dev_dbg(psy->dev, "Failed to find supply, defer!\n");
+ of_node_put(np);
return -EPROBE_DEFER;
}
+ of_node_put(np);
} while (np);
/* All supplies found, allocate char ** array for filling */