If the "regulator-name" property is not present use the name of the devicetree
node as a fallback.

Signed-off-by: Lars-Peter Clausen <l...@metafoo.de>
---
 drivers/regulator/of_regulator.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 7827384..53a83e8 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -25,6 +25,8 @@ static void of_get_regulation_constraints(struct device_node 
*np,
        struct regulation_constraints *constraints = &(*init_data)->constraints;
 
        constraints->name = of_get_property(np, "regulator-name", NULL);
+       if (!constraints->name)
+               constraints->name = np->name;
 
        min_uV = of_get_property(np, "regulator-min-microvolt", NULL);
        if (min_uV)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to