Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0

Authored by Len Brown
1 parent 4389ed2ff6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Signed-off-by: Len Brown <len.brown@intel.com>

Showing 2 changed files with 6 additions and 0 deletions Side-by-side Diff

... ... @@ -377,6 +377,9 @@
377 377  
378 378 INIT_LIST_HEAD(&drive_bays);
379 379  
  380 + if (acpi_disabled)
  381 + return -ENODEV;
  382 +
380 383 /* look for dockable drive bays */
381 384 acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
382 385 ACPI_UINT32_MAX, find_bay, &bays, NULL);
... ... @@ -917,6 +917,9 @@
917 917  
918 918 dock_station = NULL;
919 919  
  920 + if (acpi_disabled)
  921 + return 0;
  922 +
920 923 /* look for a dock station */
921 924 acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
922 925 ACPI_UINT32_MAX, find_dock, &num, NULL);