diff options
| author | Rhyland Klein <rklein@nvidia.com> | 2013-06-10 23:26:39 +0200 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-06-29 03:20:54 +0200 |
| commit | 2054d6e90e26b01ac0f125a42fecba63f226e55e (patch) | |
| tree | c0798e003a78f5196cd913a3e72a4ce9b0d8a771 /drivers/power | |
| parent | power_supply: Move of_node out of the #ifdef CONFIG_OF (diff) | |
| download | linux-2054d6e90e26b01ac0f125a42fecba63f226e55e.tar.xz linux-2054d6e90e26b01ac0f125a42fecba63f226e55e.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.
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 1c517c34e4be..3b2d5df45e7a 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 */ |