[PATCH 8/9] New set of input patches - 13-i8042-unload.patch

[Dmitry Torokhov <dtor_core@ameritech.net>]

===================================================================


ChangeSet@1.1587.20.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	Tue May 11 00:58:55 2004
+++ b/drivers/input/serio/i8042.c	Tue May 11 00:58:55 2004
@@ -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();