ACPI: fix acpi_osi=!Linux

aa2e09da · Len Brown <[email protected]> · 2007-07-02 23:57:45 -04:00

Need to check for special case "acpi_osi=!Linux" before handling the
general case "acpi_osi=!*", or it will have no effect.

Signed-off-by: Len Brown <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: aa2e09da2a332e748532aa2a71b090e7e7c3203d
Parents: 52c4d73a

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
drivers/acpi/osl.c	modified	+2	−2	View file

drivers/acpi/osl.c

View file

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 58ceb18..2e7ba61 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -999,11 +999,11 @@ static int __init acpi_osi_setup(char *str)
 	if (str == NULL || *str == '\0') {
 		printk(KERN_INFO PREFIX "_OSI method disabled\n");
 		acpi_gbl_create_osi_method = FALSE;
+	} else if (!strcmp("!Linux", str)) {
+		enable_osi_linux(0);
 	} else if (*str == '!') {
 		if (acpi_osi_invalidate(++str) == AE_OK)
 			printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
-	} else if (!strcmp("!Linux", str)) {
-		enable_osi_linux(0);
 	} else if (!strcmp("Linux", str)) {
 		enable_osi_linux(1);
 	} else if (*osi_additional_string == '\0') {