Messages in this thread | | | Date | Fri, 29 Jun 2012 14:21:35 +0200 | Subject | Re: [PATCH] asus-wmi: use ASUS_WMI_METHODID_DSTS2 as default DSTS ID. | From | Corentin Chary <> |
| |
On Wed, Jun 20, 2012 at 5:47 AM, Alex Hung <alex.hung@canonical.com> wrote: > 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> > --- > drivers/platform/x86/asus-wmi.c | 7 +------ > 1 files changed, 1 insertions(+), 6 deletions(-) > > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > index 25e3093..0f69a97 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -1461,14 +1461,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) > -- > 1.7.0.4 >
Hum, I don't like acking patches referencing documentation I can't read, but I don't really have the choice !
Matthew, could you merge this one ? Thanks,
Acked-By: Corentin Chary <corentin.chary@gmail.com>
-- Corentin Chary http://xf.iksaif.net -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |