diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:42 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:42 -0400 |
| commit | e11678e4b41283ca51d8440579b29ebeae06631a (patch) | |
| tree | a116adceefd59ef212fb9e074ff99ac89a2d2e00 | |
| parent | f5549f5bd83dad45f92bb5299f3532ea166674bf (diff) | |
| parent | 4c850ead98ec52a00af5bedb3ef75963d914e844 (diff) | |
Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next
| -rw-r--r-- | drivers/regulator/tps65090-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c index bd611cdf6e1c..676f75548f00 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( | |||
| 180 | return ERR_PTR(-ENOMEM); | 180 | return ERR_PTR(-ENOMEM); |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | regulators = of_find_node_by_name(np, "regulators"); | 183 | regulators = of_get_child_by_name(np, "regulators"); |
| 184 | if (!regulators) { | 184 | if (!regulators) { |
| 185 | dev_err(&pdev->dev, "regulator node not found\n"); | 185 | dev_err(&pdev->dev, "regulator node not found\n"); |
| 186 | return ERR_PTR(-ENODEV); | 186 | return ERR_PTR(-ENODEV); |