From aa2e09da2a332e748532aa2a71b090e7e7c3203d Mon Sep 17 00:00:00 2001 From: Len Brown Date: Mon, 2 Jul 2007 23:57:45 -0400 Subject: [PATCH] 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 Signed-off-by: Linus Torvalds --- drivers/acpi/osl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 58ceb18ec997..2e7ba615d760 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') { -- 2.30.2