From 00b4c03d556653c0615a9e1fe54ea4d273466d21 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 24 Aug 2010 15:18:58 +0800
Subject: [PATCH] --- yaml --- r: 220580 b: refs/heads/master c:
 4b751cf5de975a91246110f3da1299f9e466646d h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/mfd/tps6586x.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0a4f1b477a1d..50ac4df7d46c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7944d820b1e13a5b17c3047e033bf744bcf01f1
+refs/heads/master: 4b751cf5de975a91246110f3da1299f9e466646d
diff --git a/trunk/drivers/mfd/tps6586x.c b/trunk/drivers/mfd/tps6586x.c
index 4cde31e6a252..bc6587194de9 100644
--- a/trunk/drivers/mfd/tps6586x.c
+++ b/trunk/drivers/mfd/tps6586x.c
@@ -338,6 +338,19 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
 
 static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
 {
+	struct tps6586x *tps6586x = i2c_get_clientdata(client);
+	struct tps6586x_platform_data *pdata = client->dev.platform_data;
+	int ret;
+
+	if (pdata->gpio_base) {
+		ret = gpiochip_remove(&tps6586x->gpio);
+		if (ret)
+			dev_err(&client->dev, "Can't remove gpio chip: %d\n",
+				ret);
+	}
+
+	tps6586x_remove_subdevs(tps6586x);
+	kfree(tps6586x);
 	return 0;
 }