summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-04-14 09:30:41 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-04-28 21:35:09 +0200
commitb6d71fdbab9db265454e99b480081acc971dea59 (patch)
treee41da5a05d65532674f8a3b7eb07d3daeacac95f /drivers
parentgpio: ge: Convert to platform driver (diff)
downloadlinux-b6d71fdbab9db265454e99b480081acc971dea59.tar.xz
linux-b6d71fdbab9db265454e99b480081acc971dea59.zip
gpio: max730x: Remove kfree(ts) in __max730x_remove()
The memory for ts is allocated by devm_kzalloc now, so the kfree is not required. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Juergen Beisert <jbe@pengutronix.de> Reviewed-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/gpio-max730x.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c
index 8672755f95c9..0814584fcdc1 100644
--- a/drivers/gpio/gpio-max730x.c
+++ b/drivers/gpio/gpio-max730x.c
@@ -237,10 +237,9 @@ int __max730x_remove(struct device *dev)
ts->write(dev, 0x04, 0x00);
ret = gpiochip_remove(&ts->chip);
- if (!ret) {
+ if (!ret)
mutex_destroy(&ts->lock);
- kfree(ts);
- } else
+ else
dev_err(dev, "Failed to remove GPIO controller: %d\n", ret);
return ret;