Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / drivers / acpi / asus_acpi.c

diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 90eb3c5a15cae8eae0d0d0acd296a39a838844ca..055cfd5c8766c3f217ee943e282557e7c3e7effb 100644 (file)
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1232,7 +1232,7 @@ static int __init asus_acpi_init(void)
        result = acpi_bus_register_driver(&asus_hotk_driver);
        if (result < 0) {
                remove_proc_entry(PROC_ASUS, acpi_root_dir);
-               return -ENODEV;
+               return result;
        }
 
        /*
@@ -1245,7 +1245,7 @@ static int __init asus_acpi_init(void)
        if (!asus_hotk_found) {
                acpi_bus_unregister_driver(&asus_hotk_driver);
                remove_proc_entry(PROC_ASUS, acpi_root_dir);
-               return -ENODEV;
+               return result;
        }
 
        return 0;