From b55bc779b4cad64e5623567e2f14c6c474a19eb6 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Tue, 24 Jun 2008 22:57:12 -0400 Subject: [PATCH] --- yaml --- r: 98466 b: refs/heads/master c: 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/bay.c | 3 +++ trunk/drivers/acpi/dock.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1a7464033214..c5b51973ec00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4389ed2ff61de2b1485b31bf342da913dd342f59 +refs/heads/master: 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 diff --git a/trunk/drivers/acpi/bay.c b/trunk/drivers/acpi/bay.c index 26038c2a2a71..61b6c5beb2d3 100644 --- a/trunk/drivers/acpi/bay.c +++ b/trunk/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); diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index 96c542f7fded..bb7c51f712bd 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/drivers/acpi/dock.c @@ -917,6 +917,9 @@ static int __init dock_init(void) dock_station = NULL; + if (acpi_disabled) + return 0; + /* look for a dock station */ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, find_dock, &num, NULL);