summaryrefslogtreecommitdiff
path: root/drivers/misc/ibmasm
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2006-01-10 10:00:39 +0300
committerDmitry Torokhov <dtor_core@ameritech.net>2006-01-10 10:00:39 +0300
commit5fc4e6e197c7e377f1c8ebec727d40df983aceed (patch)
tree6d7718af1f54d0a7c072f3df39f36f010ee86490 /drivers/misc/ibmasm
parent94f8d28c47aa425cbcaa4ca7fc7935cd0ddb0151 (diff)
downloadlinux-5fc4e6e197c7e377f1c8ebec727d40df983aceed.tar.xz
Input: ibmasm - fix input initialization error path
Do not try to free device that has already been unregistered, input_unregister_device() frees it automatically. Spotted by Vernon Mauery <vernux@us.ibm.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/misc/ibmasm')
-rw-r--r--drivers/misc/ibmasm/remote.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 1abd0c58ae27..0f9e3aa34d07 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -270,6 +270,7 @@ int ibmasm_init_remote_input_dev(struct service_processor *sp)
err_unregister_mouse_dev:
input_unregister_device(mouse_dev);
+ mouse_dev = NULL; /* so we don't try to free it again below */
err_free_devices:
input_free_device(mouse_dev);
input_free_device(keybd_dev);