diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:52 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:52 -0500 |
commit | cf1466fbf8274d35a04d63a3f057b67d91afd671 (patch) | |
tree | ffe64b4b39c35046fef745439c1f6a3d5cc06ff4 /drivers/regulator/88pm8607.c | |
parent | c99f21c2763f2071dc09eb4cb26cff866e19a1c5 (diff) | |
parent | 86f6673325e38274c55f3df9f919d9a618f100d4 (diff) |
Merge remote-tracking branch 'regulator/topic/of' into regulator-next
Diffstat (limited to 'drivers/regulator/88pm8607.c')
-rw-r--r-- | drivers/regulator/88pm8607.c | 3 |
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, | |||
347 | struct regulator_config *config) | 347 | struct regulator_config *config) |
348 | { | 348 | { |
349 | struct device_node *nproot, *np; | 349 | struct device_node *nproot, *np; |
350 | nproot = pdev->dev.parent->of_node; | 350 | nproot = of_node_get(pdev->dev.parent->of_node); |
351 | if (!nproot) | 351 | if (!nproot) |
352 | return -ENODEV; | 352 | return -ENODEV; |
353 | nproot = of_find_node_by_name(nproot, "regulators"); | 353 | nproot = of_find_node_by_name(nproot, "regulators"); |
@@ -363,6 +363,7 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev, | |||
363 | break; | 363 | break; |
364 | } | 364 | } |
365 | } | 365 | } |
366 | of_node_put(nproot); | ||
366 | return 0; | 367 | return 0; |
367 | } | 368 | } |
368 | #else | 369 | #else |