From: Len Brown <lenb@kernel.org>
Date: Tue, 3 Jul 2007 03:57:45 +0000 (-0400)
Subject: ACPI: fix acpi_osi=!Linux
X-Git-Tag: v2.6.22~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aa2e09da2a332e748532aa2a71b090e7e7c3203d;p=linux-2.6-omap-h63xx.git

ACPI: fix acpi_osi=!Linux

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 <len.brown@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 58ceb18ec99..2e7ba615d76 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') {