Merge branch 'devicetree/next-console' into devicetree/next

[cascardo/linux.git] / drivers / mfd / syscon.c

diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index e2a04bb..ca15878 100644 (file)
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -95,7 +95,11 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np,
        struct device_node *syscon_np;
        struct regmap *regmap;
 
-       syscon_np = of_parse_phandle(np, property, 0);
+       if (property)
+               syscon_np = of_parse_phandle(np, property, 0);
+       else
+               syscon_np = np;
+
        if (!syscon_np)
                return ERR_PTR(-ENODEV);