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 58ceb18ec997f7c16b62c1bba6035411a61450ab..2e7ba615d76043845f23c3dbd1f9192b5e4df072 100644 (file)
--- 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') {