diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:30:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:30:29 -0500 |
| commit | 115b2ce1c3b974e43e45fa6c9e20cd7271a01dff (patch) | |
| tree | 9a883fb4d84713f142c4e003fead92381c11b6c2 /drivers/misc/ibmasm/remote.c | |
| parent | dd49f96777d5a72d5591ac2112d4ac940391774e (diff) | |
| parent | 5fc4e6e197c7e377f1c8ebec727d40df983aceed (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/misc/ibmasm/remote.c')
| -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); |