diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index d05a5dc..92c4227 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -831,9 +831,9 @@ static int __init init_threaded_acpi(voi
 {
         acpi_status result = AE_OK;
         result = acpi_bus_register_driver(&acpi_threaded_toshkeys);
-        if( result != 1 )
+        if( result < 0 )
                 printk(MY_ERR "Registration of toshkeys acpi device failed\n");
-        return result != 1;
+        return result;
 }
 
 static void kill_threaded_acpi(void)
@@ -894,7 +894,7 @@ static int __init toshiba_acpi_init(void
 			hotkeys_check_per_sec = 10;
 		printk(MY_INFO "ktoshkeyd will check %d time%s per second\n",
 			hotkeys_check_per_sec, hotkeys_check_per_sec==1?"":"s");
-		if (!init_threaded_acpi()) {
+		if (init_threaded_acpi() >= 0) {
 			init_MUTEX_LOCKED(&thread_sem);
 			kernel_thread(toshiba_acpi_thread, NULL, CLONE_KERNEL);
 			down(&thread_sem);