From 2d34d0a9972f2fce8b2b5953f9a7a3915dab5767 Mon Sep 17 00:00:00 2001 From: jogo Date: Tue, 17 Dec 2013 19:05:03 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39124 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = { -- 2.11.0