Commit 63a78bb1 authored Jun 20, 2012 by Alex Hung Committed by Matthew Garrett Jul 28, 2012

asus-wmi: use ASUS_WMI_METHODID_DSTS2 as default DSTS ID.



According to responses from the BIOS team, ASUS_WMI_METHODID_DSTS2
(0x53545344) will be used as future DSTS ID. In addition, calling
asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS2, 0, 0, NULL) returns
ASUS_WMI_UNSUPPORTED_METHOD in new ASUS laptop PCs. This patch fixes
no DSTS ID will be assigned in this case.

Signed-off-by: Alex Hung <alex.hung@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: stable@kernel.org

parent f948ad07

drivers/platform/x86/asus-wmi.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -1467,14 +1467,9 @@ static int asus_wmi_platform_init(struct asus_wmi *asus)
		*/
		if (!asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS, 0, 0, NULL))
		asus->dsts_id = ASUS_WMI_METHODID_DSTS;
		else if (!asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS2, 0, 0, NULL))
		else
		asus->dsts_id = ASUS_WMI_METHODID_DSTS2;

		if (!asus->dsts_id) {
		pr_err("Can't find DSTS");
		return -ENODEV;
		}

		/* CWAP allow to define the behavior of the Fn+F2 key,
		* this method doesn't seems to be present on Eee PCs */
		if (asus->driver->quirks->wapf >= 0)