summaryrefslogtreecommitdiff
path: root/drivers/staging/nvec/nvec_kbd.c
diff options
context:
space:
mode:
authorMarc Dietrich <marvin24@gmx.de>2012-06-24 23:25:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-25 10:55:38 -0700
commit3cdde3a3d55e64e6d1ae3465701c8d9f226775f3 (patch)
treefa22619c8e6f81ac6d34c3affffeab0514046ce7 /drivers/staging/nvec/nvec_kbd.c
parentac562680577a28fa98ebecebff5e5097ccf9a9d2 (diff)
downloadlinux-3.10-3cdde3a3d55e64e6d1ae3465701c8d9f226775f3.tar.gz
linux-3.10-3cdde3a3d55e64e6d1ae3465701c8d9f226775f3.tar.bz2
linux-3.10-3cdde3a3d55e64e6d1ae3465701c8d9f226775f3.zip
staging: nvec: add remove function to nvec childs
This patch cleanups registered devices on remove. Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/nvec/nvec_kbd.c')
-rw-r--r--drivers/staging/nvec/nvec_kbd.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index 36ef6a6b01a..6cc30dcd830 100644
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -159,8 +159,17 @@ fail:
return err;
}
+static int __devexit nvec_kbd_remove(struct platform_device *pdev)
+{
+ input_unregister_device(keys_dev.input);
+ input_free_device(keys_dev.input);
+
+ return 0;
+}
+
static struct platform_driver nvec_kbd_driver = {
.probe = nvec_kbd_probe,
+ .remove = __devexit_p(nvec_kbd_remove),
.driver = {
.name = "nvec-kbd",
.owner = THIS_MODULE,