aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarka Bhadram <varkabhadram@gmail.com>2015-04-07 12:04:40 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-04-08 10:54:01 -0400
commitc4941e072ed5ac1aaad7365ba1290fdd44e7058c (patch)
tree93a4830f439c3532eb713e34ec39f2b0fcc961a6
parent61819549f572edd7fce53f228c0d8420cdc85f71 (diff)
gpio: removing kfree remove functionality
commit 3de07e5aaf290a0b58919 ("drivers: gpio: use devm_kzalloc") introduce devm_kzalloc() for allocating the memory. In this case kfree is not required to use. Above commit id introduced the bug that kfree is not removed from the remove function. This patch fix the above bug. Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-adp5588.c1
-rw-r--r--drivers/gpio/gpio-mcp23s08.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index c90273dac289..d3fe6a6776da 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -471,7 +471,6 @@ static int adp5588_gpio_remove(struct i2c_client *client)
471 471
472 gpiochip_remove(&dev->gpio_chip); 472 gpiochip_remove(&dev->gpio_chip);
473 473
474 kfree(dev);
475 return 0; 474 return 0;
476} 475}
477 476
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index a17b81fea161..2fc7ff852d16 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -1008,7 +1008,7 @@ static int mcp23s08_remove(struct spi_device *spi)
1008 mcp23s08_irq_teardown(data->mcp[addr]); 1008 mcp23s08_irq_teardown(data->mcp[addr]);
1009 gpiochip_remove(&data->mcp[addr]->chip); 1009 gpiochip_remove(&data->mcp[addr]->chip);
1010 } 1010 }
1011 kfree(data); 1011
1012 return 0; 1012 return 0;
1013} 1013}
1014 1014