From: Jonas Gorski <jogo@openwrt.org>
Date: Tue, 17 Dec 2013 19:05:03 +0000 (+0000)
Subject: gpio-button-hotplug: fix crash on remove
X-Git-Tag: reboot~8334
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5c2aee90acc78d273d96a5f3126537257757fef7;p=oweals%2Fopenwrt.git

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
---

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 = {