From a96b100fe2e3b04219879ff6ad64208131922216 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 10 Dec 2006 21:21:33 +0100
Subject: [PATCH] --- yaml --- r: 44351 b: refs/heads/master c:
 07125ab2c2641e976bbaf3b89a735ad5a99e25d3 h: refs/heads/master i:   44349:
 6638e33951dd53371abb2b6035cff8c2a0aaf495   44347:
 3193dd93cf0c63dc63c6ff510238ef8382e068d1   44343:
 5b2ba5737b2be2a2edbde7fc5f22e9e6c3c2c00f   44335:
 f1c80bd9c2797200ffd06d630fe91abbae2fa164   44319:
 4cf10ad10642f7d984c8ba94e85f034ab31ea0d7   44287:
 39ae60f601a6c6a3f5c79a1666466dd65a36d1c2 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/i2c/i2c-dev.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f8c650de2619..099030d84b1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bacb36db01c7541ffea21d4ff39219e8b211a5c
+refs/heads/master: 07125ab2c2641e976bbaf3b89a735ad5a99e25d3
diff --git a/trunk/drivers/i2c/i2c-dev.c b/trunk/drivers/i2c/i2c-dev.c
index 909428af2b7e..ac5bd2a7ca99 100644
--- a/trunk/drivers/i2c/i2c-dev.c
+++ b/trunk/drivers/i2c/i2c-dev.c
@@ -90,6 +90,7 @@ static void return_i2c_dev(struct i2c_dev *i2c_dev)
 	spin_lock(&i2c_dev_list_lock);
 	list_del(&i2c_dev->list);
 	spin_unlock(&i2c_dev_list_lock);
+	kfree(i2c_dev);
 }
 
 static ssize_t show_adapter_name(struct device *dev,
@@ -431,7 +432,6 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
 	device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
 error:
 	return_i2c_dev(i2c_dev);
-	kfree(i2c_dev);
 	return res;
 }
 
@@ -446,7 +446,6 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
 	device_remove_file(i2c_dev->dev, &dev_attr_name);
 	return_i2c_dev(i2c_dev);
 	device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
-	kfree(i2c_dev);
 
 	pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
 	return 0;