summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorLen Brown <lenb@kernel.org>2007-07-02 23:57:45 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-02 21:06:48 -0700
commitaa2e09da2a332e748532aa2a71b090e7e7c3203d (patch)
tree1495c704da5bb661e2fbdfe6bebc3fd50d028206 /drivers/acpi/osl.c
parent52c4d73a6cca0db2927b60935e57429f98eae7c1 (diff)
downloadop-kernel-dev-aa2e09da2a332e748532aa2a71b090e7e7c3203d.zip
op-kernel-dev-aa2e09da2a332e748532aa2a71b090e7e7c3203d.tar.gz
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>
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r--drivers/acpi/osl.c4
1 files changed, 2 insertions, 2 deletions
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') {
OpenPOWER on IntegriCloud