Commit 816c2eda authored by Len Brown's avatar Len Brown

dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4389ed2f
...@@ -377,6 +377,9 @@ static int __init bay_init(void) ...@@ -377,6 +377,9 @@ static int __init bay_init(void)
INIT_LIST_HEAD(&drive_bays); INIT_LIST_HEAD(&drive_bays);
if (acpi_disabled)
return -ENODEV;
/* look for dockable drive bays */ /* look for dockable drive bays */
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, find_bay, &bays, NULL); ACPI_UINT32_MAX, find_bay, &bays, NULL);
......
...@@ -917,6 +917,9 @@ static int __init dock_init(void) ...@@ -917,6 +917,9 @@ static int __init dock_init(void)
dock_station = NULL; dock_station = NULL;
if (acpi_disabled)
return 0;
/* look for a dock station */ /* look for a dock station */
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, find_dock, &num, NULL); ACPI_UINT32_MAX, find_dock, &num, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment