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

diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c
index 2f1341d..f0ba8c4 100644 (file)
--- a/drivers/regulator/as3711-regulator.c
+++ b/drivers/regulator/as3711-regulator.c
@@ -303,7 +303,7 @@ static int as3711_regulator_probe(struct platform_device *pdev)
                reg_data = pdata ? pdata->init_data[id] : NULL;
 
                /* No need to register if there is no regulator data */
-               if (!ri->desc.name)
+               if (!reg_data)
                        continue;
 
                reg = &regs[id];