---

yaml --- r: 220580 b: refs/heads/master c: 4b751cf h: refs/heads/master v: v3
git-mirror · Oct 28, 2010 · 00b4c03 · 00b4c03
1 parent 428b7ce
commit 00b4c03
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -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;
 }