summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:42 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:42 +0100
commite11678e4b41283ca51d8440579b29ebeae06631a (patch)
treea116adceefd59ef212fb9e074ff99ac89a2d2e00 /drivers/regulator
parentf5549f5bd83dad45f92bb5299f3532ea166674bf (diff)
parent4c850ead98ec52a00af5bedb3ef75963d914e844 (diff)
downloadop-kernel-dev-e11678e4b41283ca51d8440579b29ebeae06631a.zip
op-kernel-dev-e11678e4b41283ca51d8440579b29ebeae06631a.tar.gz
Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps65090-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index bd611cdf..676f755 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -180,7 +180,7 @@ static struct tps65090_platform_data *tps65090_parse_dt_reg_data(
return ERR_PTR(-ENOMEM);
}
- regulators = of_find_node_by_name(np, "regulators");
+ regulators = of_get_child_by_name(np, "regulators");
if (!regulators) {
dev_err(&pdev->dev, "regulator node not found\n");
return ERR_PTR(-ENODEV);
OpenPOWER on IntegriCloud