Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next

diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index bd611cdf6e1c595754ec5b09dccbf0be447cc9c3..676f75548f0028435b6795bc0371490c462a641e 100644 (file)
--- 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);