Skip to content

Commit 816c2ed

Browse files
committed
dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
Signed-off-by: Len Brown <[email protected]>
1 parent 4389ed2 commit 816c2ed

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

drivers/acpi/bay.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,9 @@ static int __init bay_init(void)
377377

378378
INIT_LIST_HEAD(&drive_bays);
379379

380+
if (acpi_disabled)
381+
return -ENODEV;
382+
380383
/* look for dockable drive bays */
381384
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
382385
ACPI_UINT32_MAX, find_bay, &bays, NULL);

drivers/acpi/dock.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,9 @@ static int __init dock_init(void)
917917

918918
dock_station = NULL;
919919

920+
if (acpi_disabled)
921+
return 0;
922+
920923
/* look for a dock station */
921924
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
922925
ACPI_UINT32_MAX, find_dock, &num, NULL);

0 commit comments

Comments
 (0)