summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/da9052-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 13:42:52 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 13:42:52 +0100
commitcf1466fbf8274d35a04d63a3f057b67d91afd671 (patch)
treeffe64b4b39c35046fef745439c1f6a3d5cc06ff4 /drivers/regulator/da9052-regulator.c
parentMerge remote-tracking branch 'regulator/topic/mc13892' into regulator-next (diff)
parentregulator: mc13xxx: Use of_get_child_count() (diff)
downloadlinux-cf1466fbf8274d35a04d63a3f057b67d91afd671.tar.xz
linux-cf1466fbf8274d35a04d63a3f057b67d91afd671.zip
Merge remote-tracking branch 'regulator/topic/of' into regulator-next
Diffstat (limited to 'drivers/regulator/da9052-regulator.c')
-rw-r--r--drivers/regulator/da9052-regulator.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index c6d8651fd329..96b569abb46c 100644
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -366,9 +366,9 @@ static int da9052_regulator_probe(struct platform_device *pdev)
config.init_data = pdata->regulators[pdev->id];
} else {
#ifdef CONFIG_OF
- struct device_node *nproot = da9052->dev->of_node;
- struct device_node *np;
+ struct device_node *nproot, *np;
+ nproot = of_node_get(da9052->dev->of_node);
if (!nproot)
return -ENODEV;
@@ -385,6 +385,7 @@ static int da9052_regulator_probe(struct platform_device *pdev)
break;
}
}
+ of_node_put(nproot);
#endif
}