===== i8042.c 1.71 vs edited =====
--- 1.71/drivers/input/serio/i8042.c	2005-01-03 08:11:49 -05:00
+++ edited/i8042.c	2005-01-21 11:50:11 -05:00
@@ -696,7 +696,10 @@
 		unsigned char param;
 
 		if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-			printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
+			if (i8042_read_status() != 0xFF)
+				printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
+			else
+				printk(KERN_ERR "i8042.c: no i8042 controller found.\n");
 			return -1;
 		}
 
@@ -1016,16 +1019,22 @@
 	i8042_aux_values.irq = I8042_AUX_IRQ;
 	i8042_kbd_values.irq = I8042_KBD_IRQ;
 
-	if (i8042_controller_init())
+	if (i8042_controller_init()) {
+		i8042_platform_exit();
 		return -ENODEV;
+	}
 
 	err = driver_register(&i8042_driver);
-	if (err)
+	if (err) {
+		i8042_platform_exit();
 		return err;
+	}
 
 	i8042_platform_device = platform_device_register_simple("i8042", -1, NULL, 0);
 	if (IS_ERR(i8042_platform_device)) {
 		driver_unregister(&i8042_driver);
+		i8042_platform_exit();
+		del_timer_sync(&i8042_timer);
 		return PTR_ERR(i8042_platform_device);
 	}