From a4af0fa45ff2d4a78f73997d3db76bad25d0fdb7 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sat, 12 Jan 2013 14:58:35 +0800
Subject: [PATCH] --- yaml --- r: 350423 b: refs/heads/master c:
 240a529108a11d235328a140fe6b03cf76cef099 h: refs/heads/master i:   350421:
 9c7c785d5eda35d39e38cf2bf73b0523f139f000   350419:
 21f41952cf4155dee55198da2c2a0461beb29f2b   350415:
 2b98ed74e9e1b0694456ae0734a3f30ef10ab476 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/regulator/lp8755.c | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d9edc8ee2ab3..8eb5264f9a6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cad877ef0af8d18aae88bb7d0f30f747f003fd0f
+refs/heads/master: 240a529108a11d235328a140fe6b03cf76cef099
diff --git a/trunk/drivers/regulator/lp8755.c b/trunk/drivers/regulator/lp8755.c
index decb3adbf04a..8c3f3f2094c6 100644
--- a/trunk/drivers/regulator/lp8755.c
+++ b/trunk/drivers/regulator/lp8755.c
@@ -497,35 +497,36 @@ static int lp8755_probe(struct i2c_client *client,
 		if (!pchip->pdata)
 			return -ENOMEM;
 		ret = lp8755_init_data(pchip);
-		if (ret < 0)
-			goto err_chip_init;
+		if (ret < 0) {
+			dev_err(&client->dev, "fail to initialize chip\n");
+			return ret;
+		}
 	}
 
 	ret = lp8755_regulator_init(pchip);
-	if (ret < 0)
+	if (ret < 0) {
+		dev_err(&client->dev, "fail to initialize regulators\n");
 		goto err_regulator;
+	}
 
 	pchip->irq = client->irq;
 	ret = lp8755_int_config(pchip);
-	if (ret < 0)
+	if (ret < 0) {
+		dev_err(&client->dev, "fail to irq config\n");
 		goto err_irq;
+	}
 
 	return ret;
 
 err_irq:
-	dev_err(&client->dev, "fail to irq config\n");
-
 	for (icnt = 0; icnt < mphase_buck[pchip->mphase].nreg; icnt++)
 		regulator_unregister(pchip->rdev[icnt]);
 
 err_regulator:
-	dev_err(&client->dev, "fail to initialize regulators\n");
 	/* output disable */
 	for (icnt = 0; icnt < 0x06; icnt++)
 		lp8755_write(pchip, icnt, 0x00);
 
-err_chip_init:
-	dev_err(&client->dev, "fail to initialize chip\n");
 	return ret;
 }