diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-10 02:00:39 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-10 02:00:39 -0500 |
commit | 5fc4e6e197c7e377f1c8ebec727d40df983aceed (patch) | |
tree | 6d7718af1f54d0a7c072f3df39f36f010ee86490 | |
parent | 94f8d28c47aa425cbcaa4ca7fc7935cd0ddb0151 (diff) |
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>
-rw-r--r-- | drivers/misc/ibmasm/remote.c | 1 |
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) | |||
270 | 270 | ||
271 | err_unregister_mouse_dev: | 271 | err_unregister_mouse_dev: |
272 | input_unregister_device(mouse_dev); | 272 | input_unregister_device(mouse_dev); |
273 | mouse_dev = NULL; /* so we don't try to free it again below */ | ||
273 | err_free_devices: | 274 | err_free_devices: |
274 | input_free_device(mouse_dev); | 275 | input_free_device(mouse_dev); |
275 | input_free_device(keybd_dev); | 276 | input_free_device(keybd_dev); |