login
Header Space

 
 

[PATCH for 2.6.22] ACPI: fix acpi_osi=!Linux

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Linus Torvalds <torvalds@...>
Cc: <linux-acpi@...>, <linux-kernel@...>, <a.biardi@...>
Date: Monday, July 2, 2007 - 11:57 pm

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

Signed-off-by: Len Brown <len.brown@intel.com>
---
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') {
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH for 2.6.22] ACPI: fix acpi_osi=!Linux, Len Brown, (Mon Jul 2, 11:57 pm)
speck-geostationary