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

http://bugzilla.kernel.org/show_bug.cgi?id=2465

[ACPI] toshiba_acpi driver if acpi_disabled (David Shaohua Li)
http://bugzilla.kernel.org/show_bug.cgi?id=2465
62560d62 · Len Brown · Len Brown · da6a1551 · 62560d62
Commit 62560d62 authored Apr 27, 2004 by Len Brown Committed by Len Brown Apr 27, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/acpi/toshiba_acpi.c drivers/acpi/toshiba_acpi.c +2 -0

No files found.
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -527,6 +527,8 @@ toshiba_acpi_init(void)
 	acpi_status status = AE_OK;
 	u32 hci_result;

+	if (acpi_disabled)
+		return -ENODEV;
 	/* simple device detection: look for HCI method */
 	if (is_valid_acpi_path(METHOD_HCI_1))
 		method_hci = METHOD_HCI_1;