X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Facpi%2Fbay.c;h=61b6c5beb2d347d32d1fe1e3ee1ff8195e5f731d;hb=6329d3021bcfa9038621e6e917d98929421d8ec8;hp=26038c2a2a71bb20026a0631e890b6d57705805e;hpb=34a5d713056c325e5bf2b5361646585d5f550a72;p=linux-2.6

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 26038c2a2a..61b6c5beb2 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -377,6 +377,9 @@ static int __init bay_init(void)
 
 	INIT_LIST_HEAD(&drive_bays);
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	/* look for dockable drive bays */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 		ACPI_UINT32_MAX, find_bay, &bays, NULL);