--- 2.6.10-rc1-mm1/drivers/acpi/asus_acpi.c.orig	2004-10-27 12:41:07.642080571 -0600
+++ 2.6.10-rc1-mm1/drivers/acpi/asus_acpi.c	2004-10-27 12:41:48.714345693 -0600
@@ -1213,7 +1213,8 @@
 
 	result = acpi_bus_register_driver(&asus_hotk_driver);
 	if (result < 1) {
-		acpi_bus_unregister_driver(&asus_hotk_driver);
+		if (result >= 0)
+			acpi_bus_unregister_driver(&asus_hotk_driver);
 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
 		return -ENODEV;
 	}
--- 2.6.10-rc1-mm1/drivers/acpi/thinkpad_acpi.c.orig	2004-10-27 12:42:14.422353190 -0600
+++ 2.6.10-rc1-mm1/drivers/acpi/thinkpad_acpi.c	2004-10-27 12:43:40.715320883 -0600
@@ -247,8 +247,11 @@
 		return -ENODEV;
 
 	result = acpi_bus_register_driver(&acpi_thinkpad_driver);
-	if (result != 1)
+	if (result != 1) {
+		if (result >= 0)
+			acpi_bus_unregister_driver(&acpi_thinkpad_driver);
 		return -ENODEV;
+	}
 
 	printk(KERN_INFO LOGPREFIX "ACPI IBM Thinkpad Fn+Fx key driver version %s\n", DRIVER_VERSION);