Oliver Neukum 17d45d
From c0e4aa78716401e8d7d5434b69bbf6596b55a936 Mon Sep 17 00:00:00 2001
Oliver Neukum 17d45d
From: Mario Limonciello <mario.limonciello@dell.com>
Oliver Neukum 17d45d
Date: Wed, 21 Jun 2017 17:01:35 -0500
Oliver Neukum 17d45d
Subject: [PATCH] platform/x86: alienware-wmi: Adjust instance of
Oliver Neukum 17d45d
 wmi_evaluate_method calls to 0
Oliver Neukum 17d45d
Git-commit: c0e4aa78716401e8d7d5434b69bbf6596b55a936
Oliver Neukum 17d45d
References: git-fixes
Oliver Neukum 17d45d
Patch-mainline: v4.13-rc1
Oliver Neukum 17d45d
Oliver Neukum 17d45d
Pali recently noticed that WMI instances are zero indexed.
Oliver Neukum 17d45d
Oliver Neukum 17d45d
The only reason that these calls all worked properly is because the ASL
Oliver Neukum 17d45d
didn't verify the instance number.
Oliver Neukum 17d45d
Oliver Neukum 17d45d
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Oliver Neukum 17d45d
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Oliver Neukum 17d45d
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Oliver Neukum 17d45d
---
Oliver Neukum 17d45d
 drivers/platform/x86/alienware-wmi.c | 8 ++++----
Oliver Neukum 17d45d
 1 file changed, 4 insertions(+), 4 deletions(-)
Oliver Neukum 17d45d
Oliver Neukum 17d45d
diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
Oliver Neukum 17d45d
index d6b34923fb4e..9866fec78c1c 100644
Oliver Neukum 17d45d
--- a/drivers/platform/x86/alienware-wmi.c
Oliver Neukum 17d45d
+++ b/drivers/platform/x86/alienware-wmi.c
Oliver Neukum 17d45d
@@ -303,7 +303,7 @@ static int alienware_update_led(struct platform_zone *zone)
Oliver Neukum 17d45d
 	}
Oliver Neukum 17d45d
 	pr_debug("alienware-wmi: guid %s method %d\n", guid, method_id);
Oliver Neukum 17d45d
 
Oliver Neukum 17d45d
-	status = wmi_evaluate_method(guid, 1, method_id, &input, NULL);
Oliver Neukum 17d45d
+	status = wmi_evaluate_method(guid, 0, method_id, &input, NULL);
Oliver Neukum 17d45d
 	if (ACPI_FAILURE(status))
Oliver Neukum 17d45d
 		pr_err("alienware-wmi: zone set failure: %u\n", status);
Oliver Neukum 17d45d
 	return ACPI_FAILURE(status);
Oliver Neukum 17d45d
@@ -352,7 +352,7 @@ static int wmax_brightness(int brightness)
Oliver Neukum 17d45d
 	};
Oliver Neukum 17d45d
 	input.length = (acpi_size) sizeof(args);
Oliver Neukum 17d45d
 	input.pointer = &arg;;
Oliver Neukum 17d45d
-	status = wmi_evaluate_method(WMAX_CONTROL_GUID, 1,
Oliver Neukum 17d45d
+	status = wmi_evaluate_method(WMAX_CONTROL_GUID, 0,
Oliver Neukum 17d45d
 				     WMAX_METHOD_BRIGHTNESS, &input, NULL);
Oliver Neukum 17d45d
 	if (ACPI_FAILURE(status))
Oliver Neukum 17d45d
 		pr_err("alienware-wmi: brightness set failure: %u\n", status);
Oliver Neukum 17d45d
@@ -506,10 +506,10 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args,
Oliver Neukum 17d45d
 	if (out_data != NULL) {
Oliver Neukum 17d45d
 		output.length = ACPI_ALLOCATE_BUFFER;
Oliver Neukum 17d45d
 		output.pointer = NULL;
Oliver Neukum 17d45d
-		status = wmi_evaluate_method(WMAX_CONTROL_GUID, 1,
Oliver Neukum 17d45d
+		status = wmi_evaluate_method(WMAX_CONTROL_GUID, 0,
Oliver Neukum 17d45d
 					     command, &input, &output);
Oliver Neukum 17d45d
 	} else
Oliver Neukum 17d45d
-		status = wmi_evaluate_method(WMAX_CONTROL_GUID, 1,
Oliver Neukum 17d45d
+		status = wmi_evaluate_method(WMAX_CONTROL_GUID, 0,
Oliver Neukum 17d45d
 					     command, &input, NULL);
Oliver Neukum 17d45d
 
Oliver Neukum 17d45d
 	if (ACPI_SUCCESS(status) && out_data != NULL) {
Oliver Neukum 17d45d
-- 
Oliver Neukum 17d45d
2.40.1
Oliver Neukum 17d45d