diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:43 +0100 |
| commit | 2532a395003a2f6ea765f263aae39129a2bd828f (patch) | |
| tree | b21906fef52fd7ded5d77a96aeae73cfdb476544 | |
| parent | e11678e4b41283ca51d8440579b29ebeae06631a (diff) | |
| parent | 712c967fec612f572d9eea5d031278512f642cf8 (diff) | |
| download | op-kernel-dev-2532a395003a2f6ea765f263aae39129a2bd828f.zip op-kernel-dev-2532a395003a2f6ea765f263aae39129a2bd828f.tar.gz | |
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
| -rw-r--r-- | drivers/regulator/tps6586x-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c index 45e5d68..e8e3a8a 100644 --- a/drivers/regulator/tps6586x-regulator.c +++ b/drivers/regulator/tps6586x-regulator.c @@ -298,7 +298,7 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt( struct tps6586x_platform_data *pdata; int err; - regs = of_find_node_by_name(np, "regulators"); + regs = of_get_child_by_name(np, "regulators"); if (!regs) { dev_err(&pdev->dev, "regulator node not found\n"); return NULL; |
