diff --git a/[refs] b/[refs] index fa3f5ec55f31..5898ebf3b97b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b6e7220ed2be6e40bbda4eeb2b9c397008f2cef +refs/heads/master: f0903863099668d6b03c7ea90b2e58a7ad1be6a3 diff --git a/trunk/drivers/staging/quickstart/quickstart.c b/trunk/drivers/staging/quickstart/quickstart.c index 66122479d529..33c09fad1856 100644 --- a/trunk/drivers/staging/quickstart/quickstart.c +++ b/trunk/drivers/staging/quickstart/quickstart.c @@ -398,16 +398,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) {