From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 5 Sep 2013 03:31:25 +0000 (+0800)
Subject: regulator: palmas: Drop regulator_unregister while using devm_regulator_register
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cb2e45e31615bc37b31b44fc257042a860ce82b8;p=linux-beck.git

regulator: palmas: Drop regulator_unregister while using devm_regulator_register

Commmit af40a94aba "regulator: palmas: Use devm_regulator_register" missed
removing a regulator_unregister() call if palmas_extreg_init falis. Fix it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 6c9670ff6be5..b5278ac4e6bd 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -1037,10 +1037,8 @@ static int palmas_regulators_probe(struct platform_device *pdev)
 				else
 					ret = palmas_extreg_init(palmas,
 							id, reg_init);
-				if (ret) {
-					regulator_unregister(pmic->rdev[id]);
+				if (ret)
 					return ret;
-				}
 			}
 		}
 	}