From 3a1a65e9e575d2cf924ea60ed22815866573b350 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Sat, 20 Mar 2010 15:12:58 +0100
Subject: [PATCH] --- yaml --- r: 188981 b: refs/heads/master c:
 8b4709ecea4aab1957ae7b726d6824485404a3a5 h: refs/heads/master i:   188979:
 b251145ebee3cff34f282d7f45980a1ad3da6f64 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/regulator/max1586.c | 2 +-
 trunk/drivers/regulator/max8649.c | 3 ++-
 trunk/drivers/regulator/max8660.c | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 654774c2b826..2867ee6461b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 451a73cd46573444f68f412c87439c0a291718ec
+refs/heads/master: 8b4709ecea4aab1957ae7b726d6824485404a3a5
diff --git a/trunk/drivers/regulator/max1586.c b/trunk/drivers/regulator/max1586.c
index a49fc952c9a9..c0b09e15edb6 100644
--- a/trunk/drivers/regulator/max1586.c
+++ b/trunk/drivers/regulator/max1586.c
@@ -243,8 +243,8 @@ static int __devexit max1586_pmic_remove(struct i2c_client *client)
 	for (i = 0; i <= MAX1586_V6; i++)
 		if (rdev[i])
 			regulator_unregister(rdev[i]);
-	kfree(rdev);
 	i2c_set_clientdata(client, NULL);
+	kfree(rdev);
 
 	return 0;
 }
diff --git a/trunk/drivers/regulator/max8649.c b/trunk/drivers/regulator/max8649.c
index 3ebdf698c648..833aaedc7e64 100644
--- a/trunk/drivers/regulator/max8649.c
+++ b/trunk/drivers/regulator/max8649.c
@@ -356,6 +356,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
 	dev_info(info->dev, "Max8649 regulator device is detected.\n");
 	return 0;
 out:
+	i2c_set_clientdata(client, NULL);
 	kfree(info);
 	return ret;
 }
@@ -367,9 +368,9 @@ static int __devexit max8649_regulator_remove(struct i2c_client *client)
 	if (info) {
 		if (info->regulator)
 			regulator_unregister(info->regulator);
+		i2c_set_clientdata(client, NULL);
 		kfree(info);
 	}
-	i2c_set_clientdata(client, NULL);
 
 	return 0;
 }
diff --git a/trunk/drivers/regulator/max8660.c b/trunk/drivers/regulator/max8660.c
index f12f1bb62138..47f90b2fc290 100644
--- a/trunk/drivers/regulator/max8660.c
+++ b/trunk/drivers/regulator/max8660.c
@@ -470,8 +470,8 @@ static int __devexit max8660_remove(struct i2c_client *client)
 	for (i = 0; i < MAX8660_V_END; i++)
 		if (rdev[i])
 			regulator_unregister(rdev[i]);
-	kfree(rdev);
 	i2c_set_clientdata(client, NULL);
+	kfree(rdev);
 
 	return 0;
 }