From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>,
Platform Driver <platform-driver-x86@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
stable@vger.kernel.org
Subject: Re: [PATCH] platform/x86: peaq-wmi: Add DMI check before binding to the WMI interface
Date: Thu, 5 Oct 2017 17:23:47 +0300 [thread overview]
Message-ID: <CAHp75VezzgBXscqiVg_eFkpQdk8NPjQVyxh2FH_DuXop74KzLw@mail.gmail.com> (raw)
In-Reply-To: <20171005142021.4899-1-hdegoede@redhat.com>
On Thu, Oct 5, 2017 at 5:20 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> It seems that the WMI GUID used by the PEAQ 2-in-1 WMI hotkeys is not
> as unique as a GUID should be and is used on some other devices too.
>
> This is causing spurious key-press reports on these other devices.
>
> This commits adds a DMI check to the PEAQ 2-in-1 WMI hotkeys driver to
> ensure that it is actually running on a PEAQ 2-in-1, fixing the
> spurious key-presses on these other devices.
>
Recently I have pushed similar patch (another device). Can you rebase
against testing?
> BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1497861
> BugLink: https://bugzilla.suse.com/attachment.cgi?id=743182
> Cc: stable@vger.kernel.org
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/platform/x86/peaq-wmi.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/drivers/platform/x86/peaq-wmi.c b/drivers/platform/x86/peaq-wmi.c
> index bc98ef95514a..67fa3fa32011 100644
> --- a/drivers/platform/x86/peaq-wmi.c
> +++ b/drivers/platform/x86/peaq-wmi.c
> @@ -8,6 +8,7 @@
> */
>
> #include <linux/acpi.h>
> +#include <linux/dmi.h>
> #include <linux/input-polldev.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> @@ -64,8 +65,22 @@ static void peaq_wmi_poll(struct input_polled_dev *dev)
> }
> }
>
> +/* Some other devices (Shuttle XS35) use the same WMI GUID for other purposes */
> +static const struct dmi_system_id peaq_dmi_table[] = {
> + {
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "PEAQ"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "PEAQ PMM C1010 MD99187"),
> + },
> + },
> +};
> +
> static int __init peaq_wmi_init(void)
> {
> + /* WMI GUID is not unique, also check for a DMI match */
> + if (!dmi_check_system(peaq_dmi_table))
> + return -ENODEV;
> +
> if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
> return -ENODEV;
>
> @@ -86,6 +101,9 @@ static int __init peaq_wmi_init(void)
>
> static void __exit peaq_wmi_exit(void)
> {
> + if (!dmi_check_system(peaq_dmi_table))
> + return;
> +
> if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
> return;
>
> --
> 2.14.2
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2017-10-05 14:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 14:20 [PATCH] platform/x86: peaq-wmi: Add DMI check before binding to the WMI interface Hans de Goede
2017-10-05 14:23 ` Andy Shevchenko [this message]
2017-10-05 14:27 ` Hans de Goede
2017-10-05 17:59 ` Andy Shevchenko
2017-10-05 18:04 ` Hans de Goede
2017-10-05 18:12 ` Andy Shevchenko
2017-10-05 18:04 [PATCH resend] " Hans de Goede
2017-10-05 18:04 ` [PATCH] " Hans de Goede
2017-10-05 18:19 ` Andy Shevchenko
2017-10-06 16:47 ` Darren Hart
2017-10-08 18:09 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHp75VezzgBXscqiVg_eFkpQdk8NPjQVyxh2FH_DuXop74KzLw@mail.gmail.com \
--to=andy.shevchenko@gmail.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.