From 0bc69388fca352bcc0dc4c986d9070208cf97707 Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Wed, 20 Feb 2013 18:27:21 +0900
Subject: [PATCH] --- yaml --- r: 373207 b: refs/heads/master c:
 85529575b67c318e296ae183cc80617d79aea23b h: refs/heads/master i:   373205:
 b65e0f04eafccaee307d8dc16fe2c817561405ac   373203:
 bcff3935a746dcde76bfb7d2a1ab0d52ed5feec9   373199:
 fef85c2e9598216b567cd421aca3d00259ffd89f v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mfd/88pm860x-core.c | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 38838e651ab6..fb4afdbe007a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6cc25fda58da8685ecef3f179adc7b99c8253b2
+refs/heads/master: 85529575b67c318e296ae183cc80617d79aea23b
diff --git a/trunk/drivers/mfd/88pm860x-core.c b/trunk/drivers/mfd/88pm860x-core.c
index 893fc1ba6ead..31ca55548ef9 100644
--- a/trunk/drivers/mfd/88pm860x-core.c
+++ b/trunk/drivers/mfd/88pm860x-core.c
@@ -1144,17 +1144,15 @@ static int pm860x_probe(struct i2c_client *client,
 			return -ENOMEM;
 		ret = pm860x_dt_init(node, &client->dev, pdata);
 		if (ret)
-			goto err;
+			return ret;
 	} else if (!pdata) {
 		pr_info("No platform data in %s!\n", __func__);
 		return -EINVAL;
 	}
 
 	chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL);
-	if (chip == NULL) {
-		ret = -ENOMEM;
-		goto err;
-	}
+	if (chip == NULL)
+		return -ENOMEM;
 
 	chip->id = verify_addr(client);
 	chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config);
@@ -1194,10 +1192,6 @@ static int pm860x_probe(struct i2c_client *client,
 
 	pm860x_device_init(chip, pdata);
 	return 0;
-err:
-	if (node)
-		devm_kfree(&client->dev, pdata);
-	return ret;
 }
 
 static int pm860x_remove(struct i2c_client *client)