aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/gpio-button-hotplug/src
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-12-17 19:05:03 +0000
committerJonas Gorski <jogo@openwrt.org>2013-12-17 19:05:03 +0000
commit5c2aee90acc78d273d96a5f3126537257757fef7 (patch)
tree9b8ad4eafc47c349741f057a8dba0e30ea0030a1 /package/kernel/gpio-button-hotplug/src
parent7a24db90aa7543999d7f3b72dd580c40f137be91 (diff)
downloadupstream-5c2aee90acc78d273d96a5f3126537257757fef7.tar.gz
upstream-5c2aee90acc78d273d96a5f3126537257757fef7.tar.bz2
upstream-5c2aee90acc78d273d96a5f3126537257757fef7.zip
gpio-button-hotplug: fix crash on remove
Don't call gpio_keys_remove recursively. Setting the platform data to NULL triggered an oops on the second iteration, so there was no infinate loop. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 39124
Diffstat (limited to 'package/kernel/gpio-button-hotplug/src')
-rw-r--r--package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 1a8b47691c..780736c89b 100644
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -612,7 +612,7 @@ static int gpio_keys_remove(struct platform_device *pdev)
if (bdev->polled)
gpio_keys_polled_close(bdev);
- return gpio_keys_remove(pdev);
+ return 0;
}
static struct platform_driver gpio_keys_driver = {