From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 14 Jul 2008 20:38:36 +0000 (+0200)
Subject: i2c: Call client_unregister for new-style devices too
X-Git-Tag: v2.6.27-rc1~1077^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8508159e2f3b82bf109f0ec77bcbd8ff3f3a7e17;p=linux-2.6-omap-h63xx.git

i2c: Call client_unregister for new-style devices too

We call adapter->client_register for both legacy and new-style i2c
devices, however we only call adapter->client_unregister for legacy
drivers. This doesn't make much sense. Usually, drivers will undo
in client_unregister what they did in client_register, so we should
call neither or both for every given i2c device.

In order to ease the transition from legacy to new-style devices, it
seems preferable to actually call both.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: David Brownell <david-b@pacbell.net>
---

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index e45bb2838f4..5e249d75882 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -300,6 +300,14 @@ void i2c_unregister_device(struct i2c_client *client)
 		return;
 	}
 
+	if (adapter->client_unregister) {
+		if (adapter->client_unregister(client)) {
+			dev_warn(&client->dev,
+				 "client_unregister [%s] failed\n",
+				 client->name);
+		}
+	}
+
 	mutex_lock(&adapter->clist_lock);
 	list_del(&client->list);
 	mutex_unlock(&adapter->clist_lock);