summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-08-24 09:18:58 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-29 00:28:53 +0200
commit4b751cf5de975a91246110f3da1299f9e466646d (patch)
treea20e81c0be2bddf9a2db6b6592a2f232a8642006 /drivers/mfd
parentusb: otg: twl4030-usb: switch over to defines in twl.h (diff)
downloadlinux-4b751cf5de975a91246110f3da1299f9e466646d.tar.xz
linux-4b751cf5de975a91246110f3da1299f9e466646d.zip
mfd: Free tps6586x allocated resources when unload the module
For the resources allocated in tps6586x_i2c_probe(), we need to free it in tps6586x_i2c_remove(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tps6586x.c13
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;
}