Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / quickstart / quickstart.c

diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c
index ba8f670ec0a701200000d084987faa300f13faaa..d746715d3d894cbc10e02aa0e2c117442b30ddbf 100644 (file)
--- a/drivers/staging/quickstart/quickstart.c
+++ b/drivers/staging/quickstart/quickstart.c
@@ -397,16 +397,15 @@ static int __init quickstart_init_input(void)
 static int __init quickstart_init(void)
 {
        int ret;
-       acpi_status status = 0;
 
        /* ACPI Check */
        if (acpi_disabled)
                return -ENODEV;
 
        /* ACPI driver register */
-       status = acpi_bus_register_driver(&quickstart_acpi_driver);
-       if (status < 0)
-               return -ENODEV;
+       ret = acpi_bus_register_driver(&quickstart_acpi_driver);
+       if (ret)
+               return ret;
 
        /* If existing bus with no devices */
        if (!quickstart_data.btn_lst) {