Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas

Conflicts:
	drivers/regulator/palmas-regulator.c

diff --cc drivers/regulator/palmas-regulator.c
index 76ce09c6b594784aed1c652a9a2a2ec068c96d8c,b5278ac4e6bde82aae461c7a44e7600db38c1683..1b31e414fde126847d7e5f0a859644d0f395a540
--- 1/drivers/regulator/palmas-regulator.c
--- 2/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@@ -1008,9 -874,7 +1008,9 @@@ static int palmas_regulators_probe(stru
                        reg_init = pdata->reg_init[id];
                        ret = palmas_smps_init(palmas, id, reg_init);
                        if (ret)
-                               goto err_unregister_regulator;
+                               return ret;
 +              } else {
 +                      reg_init = NULL;
                }
  
                /* Register the regulators */