1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 4cde31e6a252..bc6587194de9 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -338,6 +338,19 @@ err_add_devs:
 
 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;
 }