From: Mark Brown <broonie@linaro.org>
Date: Mon, 16 Sep 2013 23:34:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d0175e7e78ef6dddf13a67f968332b3e44a5995d;p=deliverable%2Flinux.git

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

Conflicts:
	drivers/regulator/palmas-regulator.c
---

d0175e7e78ef6dddf13a67f968332b3e44a5995d
diff --cc drivers/regulator/palmas-regulator.c
index 76ce09c6b594,b5278ac4e6bd..1b31e414fde1
--- a/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 */