summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/88pm8607.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 12:42:52 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 12:42:52 +0000
commitcf1466fbf8274d35a04d63a3f057b67d91afd671 (patch)
treeffe64b4b39c35046fef745439c1f6a3d5cc06ff4 /drivers/regulator/88pm8607.c
parentc99f21c2763f2071dc09eb4cb26cff866e19a1c5 (diff)
parent86f6673325e38274c55f3df9f919d9a618f100d4 (diff)
downloadlinux-cf1466fbf8274d35a04d63a3f057b67d91afd671.tar.bz2
Merge remote-tracking branch 'regulator/topic/of' into regulator-next
Diffstat (limited to 'drivers/regulator/88pm8607.c')
-rw-r--r--drivers/regulator/88pm8607.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index a957e8c53205..c79ab843333e 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -347,7 +347,7 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev,
struct regulator_config *config)
{
struct device_node *nproot, *np;
- nproot = pdev->dev.parent->of_node;
+ nproot = of_node_get(pdev->dev.parent->of_node);
if (!nproot)
return -ENODEV;
nproot = of_find_node_by_name(nproot, "regulators");
@@ -363,6 +363,7 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev,
break;
}
}
+ of_node_put(nproot);
return 0;
}
#else