Messages in this thread Patch in this message | | | From | Vojtech Pavlik <> | Date | Mon, 7 Jun 2004 13:55:54 +0200 | Subject | [PATCH 34/39] input: i8042 - kill the timer only after removing interrupt handler |
| |
You can pull this changeset from: bk://kernel.bkbits.net/vojtech/input-for-linus
===================================================================
ChangeSet@1.1587.27.14, 2004-05-10 01:40:59-05:00, dtor_core@ameritech.net Patch from Sau Dan Lee Input: i8042 - kill the timer only after removing interrupt handler, otherwise there is a chance that interrupt handler will install the timer again and it will trigger after module is unloaded.
i8042.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-)
===================================================================
diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c --- a/drivers/input/serio/i8042.c 2004-06-07 13:10:43 +02:00 +++ b/drivers/input/serio/i8042.c 2004-06-07 13:10:43 +02:00 @@ -1047,8 +1047,6 @@ sysdev_class_unregister(&kbc_sysclass); } - del_timer_sync(&i8042_timer); - i8042_controller_cleanup(); if (i8042_kbd_values.exists) @@ -1061,6 +1059,7 @@ if (i8042_mux_values[i].exists) serio_unregister_port(i8042_mux_port + i); + del_timer_sync(&i8042_timer); tasklet_kill(&i8042_tasklet); i8042_platform_exit(); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |