Commit 62560d62 authored by Len Brown's avatar Len Brown Committed by Len Brown

[ACPI] toshiba_acpi driver if acpi_disabled (David Shaohua Li)

http://bugzilla.kernel.org/show_bug.cgi?id=2465
parent da6a1551
...@@ -527,6 +527,8 @@ toshiba_acpi_init(void) ...@@ -527,6 +527,8 @@ toshiba_acpi_init(void)
acpi_status status = AE_OK; acpi_status status = AE_OK;
u32 hci_result; u32 hci_result;
if (acpi_disabled)
return -ENODEV;
/* simple device detection: look for HCI method */ /* simple device detection: look for HCI method */
if (is_valid_acpi_path(METHOD_HCI_1)) if (is_valid_acpi_path(METHOD_HCI_1))
method_hci = METHOD_HCI_1; method_hci = METHOD_HCI_1;
......
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