Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / bay.c

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index e6caf5d42e0eb72a7f49a9b44fa00c290937dbcf..61b6c5beb2d347d32d1fe1e3ee1ff8195e5f731d 100644 (file)
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -377,9 +377,6 @@ static int __init bay_init(void)
 
        INIT_LIST_HEAD(&drive_bays);
 
-       if (acpi_disabled)
-               return -ENODEV;
-
        if (acpi_disabled)
                return -ENODEV;