LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH for 2.6.22] ACPI: fix acpi_osi=!Linux
@ 2007-07-03 3:57 Len Brown
0 siblings, 0 replies; only message in thread
From: Len Brown @ 2007-07-03 3:57 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-acpi, linux-kernel, a.biardi
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') {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-07-03 3:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-07-03 3:57 [PATCH for 2.6.22] ACPI: fix acpi_osi=!Linux Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).