diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:52 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:52 +0000 |
commit | cf1466fbf8274d35a04d63a3f057b67d91afd671 (patch) | |
tree | ffe64b4b39c35046fef745439c1f6a3d5cc06ff4 /drivers/regulator/palmas-regulator.c | |
parent | c99f21c2763f2071dc09eb4cb26cff866e19a1c5 (diff) | |
parent | 86f6673325e38274c55f3df9f919d9a618f100d4 (diff) | |
download | blackbird-op-linux-cf1466fbf8274d35a04d63a3f057b67d91afd671.tar.gz blackbird-op-linux-cf1466fbf8274d35a04d63a3f057b67d91afd671.zip |
Merge remote-tracking branch 'regulator/topic/of' into regulator-next
Diffstat (limited to 'drivers/regulator/palmas-regulator.c')
-rw-r--r-- | drivers/regulator/palmas-regulator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index c9e912f583bc..cbaf22627bd3 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -527,6 +527,7 @@ static void palmas_dt_to_pdata(struct device *dev, u32 prop; int idx, ret; + node = of_node_get(node); regulators = of_find_node_by_name(node, "regulators"); if (!regulators) { dev_info(dev, "regulator node not found\n"); @@ -535,6 +536,7 @@ static void palmas_dt_to_pdata(struct device *dev, ret = of_regulator_match(dev, regulators, palmas_matches, PALMAS_NUM_REGS); + of_node_put(regulators); if (ret < 0) { dev_err(dev, "Error parsing regulator init data: %d\n", ret); return; |