projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5957e44 0cdfcc0)
Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
authorMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000 (00:34 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000 (00:34 +0100)
Conflicts:
drivers/regulator/palmas-regulator.c

1  2 
drivers/regulator/palmas-regulator.c patch | diff1 | diff2 | blob | history

diff --cc drivers/regulator/palmas-regulator.c
index 76ce09c,b5278ac..1b31e41
--- 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 */
Domain: System / Kernel;