From 2aeed883be4ffa82500b770a9ccf8e3fcc78b820 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Sat, 2 Jun 2012 09:58:02 -0700
Subject: [PATCH] --- yaml --- r: 326164 b: refs/heads/master c:
 64adf39837c7cf744161b18598577cbe2467a01d h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/hwmon/asb100.c | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 454d84aaa810..f0389daa3318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9286434ea64803b673bb4ec0dd7084b13c2d90b
+refs/heads/master: 64adf39837c7cf744161b18598577cbe2467a01d
diff --git a/trunk/drivers/hwmon/asb100.c b/trunk/drivers/hwmon/asb100.c
index 4b8814deabb1..a227be47149f 100644
--- a/trunk/drivers/hwmon/asb100.c
+++ b/trunk/drivers/hwmon/asb100.c
@@ -787,12 +787,10 @@ static int asb100_probe(struct i2c_client *client,
 	int err;
 	struct asb100_data *data;
 
-	data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL);
-	if (!data) {
-		pr_debug("probe failed, kzalloc failed!\n");
-		err = -ENOMEM;
-		goto ERROR0;
-	}
+	data = devm_kzalloc(&client->dev, sizeof(struct asb100_data),
+			    GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
 
 	i2c_set_clientdata(client, data);
 	mutex_init(&data->lock);
@@ -801,7 +799,7 @@ static int asb100_probe(struct i2c_client *client,
 	/* Attach secondary lm75 clients */
 	err = asb100_detect_subclients(client);
 	if (err)
-		goto ERROR1;
+		return err;
 
 	/* Initialize the chip */
 	asb100_init_client(client);
@@ -829,9 +827,6 @@ static int asb100_probe(struct i2c_client *client,
 ERROR3:
 	i2c_unregister_device(data->lm75[1]);
 	i2c_unregister_device(data->lm75[0]);
-ERROR1:
-	kfree(data);
-ERROR0:
 	return err;
 }
 
@@ -845,8 +840,6 @@ static int asb100_remove(struct i2c_client *client)
 	i2c_unregister_device(data->lm75[1]);
 	i2c_unregister_device(data->lm75[0]);
 
-	kfree(data);
-
 	return 0;
 }