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>
This commit is contained in:
parent
52c4d73a6c
commit
aa2e09da2a
|
@ -999,11 +999,11 @@ static int __init acpi_osi_setup(char *str)
|
||||||
if (str == NULL || *str == '\0') {
|
if (str == NULL || *str == '\0') {
|
||||||
printk(KERN_INFO PREFIX "_OSI method disabled\n");
|
printk(KERN_INFO PREFIX "_OSI method disabled\n");
|
||||||
acpi_gbl_create_osi_method = FALSE;
|
acpi_gbl_create_osi_method = FALSE;
|
||||||
|
} else if (!strcmp("!Linux", str)) {
|
||||||
|
enable_osi_linux(0);
|
||||||
} else if (*str == '!') {
|
} else if (*str == '!') {
|
||||||
if (acpi_osi_invalidate(++str) == AE_OK)
|
if (acpi_osi_invalidate(++str) == AE_OK)
|
||||||
printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
|
printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
|
||||||
} else if (!strcmp("!Linux", str)) {
|
|
||||||
enable_osi_linux(0);
|
|
||||||
} else if (!strcmp("Linux", str)) {
|
} else if (!strcmp("Linux", str)) {
|
||||||
enable_osi_linux(1);
|
enable_osi_linux(1);
|
||||||
} else if (*osi_additional_string == '\0') {
|
} else if (*osi_additional_string == '\0') {
|
||||||
|
|
Loading…
Reference in New Issue