aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/gpio-button-hotplug
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
commit000da8290388199f50090bba61ca83910f1f1f3b (patch)
treed2244f15334cdf8a4e3f8c4432f7e8ac5fa76eba /package/kernel/gpio-button-hotplug
parent58a22446f4fe72dcddc739572e0d4b6670262be3 (diff)
downloadupstream-000da8290388199f50090bba61ca83910f1f1f3b.tar.gz
upstream-000da8290388199f50090bba61ca83910f1f1f3b.tar.bz2
upstream-000da8290388199f50090bba61ca83910f1f1f3b.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39124 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/gpio-button-hotplug')
-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 = {