From 9c7c785d5eda35d39e38cf2bf73b0523f139f000 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 25 Dec 2012 10:06:20 +0800
Subject: [PATCH] --- yaml --- r: 350421 b: refs/heads/master c:
 a1a41ab4e92a42d380286a6aadb1026a2b352801 h: refs/heads/master i:   350419:
 21f41952cf4155dee55198da2c2a0461beb29f2b v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/regulator/lp8755.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dc46ba39fc82..3dce7a000f51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b59320cc5a5e6ceaa17f0895ffbe0711ebad7adf
+refs/heads/master: a1a41ab4e92a42d380286a6aadb1026a2b352801
diff --git a/trunk/drivers/regulator/lp8755.c b/trunk/drivers/regulator/lp8755.c
index dbc4d1254ca1..06a82e2cbf4b 100644
--- a/trunk/drivers/regulator/lp8755.c
+++ b/trunk/drivers/regulator/lp8755.c
@@ -358,7 +358,9 @@ static int lp8755_regulator_init(struct lp8755_chip *pchip)
 		    regulator_register(&lp8755_regulators[buck_num], &rconfig);
 		if (IS_ERR(pchip->rdev[buck_num])) {
 			ret = PTR_ERR(pchip->rdev[buck_num]);
-			dev_err(pchip->dev, "regulator init failed: buck 0\n");
+			pchip->rdev[buck_num] = NULL;
+			dev_err(pchip->dev, "regulator init failed: buck %d\n",
+				buck_num);
 			goto err_buck;
 		}
 	}
@@ -367,8 +369,7 @@ static int lp8755_regulator_init(struct lp8755_chip *pchip)
 
 err_buck:
 	for (icnt = 0; icnt < LP8755_BUCK_MAX; icnt++)
-		if (pchip->rdev[icnt] != NULL)
-			regulator_unregister(pchip->rdev[icnt]);
+		regulator_unregister(pchip->rdev[icnt]);
 	return ret;
 }
 
@@ -557,7 +558,7 @@ static struct i2c_driver lp8755_i2c_driver = {
 		   .name = LP8755_NAME,
 		   },
 	.probe = lp8755_probe,
-	.remove = __devexit_p(lp8755_remove),
+	.remove = lp8755_remove,
 	.id_table = lp8755_id,
 };