From: Rhyland Klein Date: Mon, 10 Jun 2013 21:26:39 +0000 (-0400) Subject: power_supply: Add of_node_put to fix refcount X-Git-Tag: v3.11-rc1~52^2~4 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=2054d6e90e26b01ac0f125a42fecba63f226e55e;p=cascardo%2Flinux.git 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 Signed-off-by: Anton Vorontsov --- 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 */