Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa2e09da authored by Len Brown's avatar Len Brown Committed by Linus Torvalds
Browse files

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: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 52c4d73a

drivers/acpi/osl.c

+2 −2
Original line number Diff line number Diff line
@@ -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') {