From: Kyle Evans <kvans32@gmail.com>
To: <pali.rohar@gmail.com>, <matthew.garrett@nebula.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Kyle Evans <kvans32@gmail.com>
Subject: [PATCH] hp-wmi; Limit hotkey enable funtion
Date: Wed, 14 Aug 2013 14:16:43 -0500 [thread overview]
Message-ID: <1376507803-7718-1-git-send-email-kvans32@gmail.com> (raw)
In-Reply-To: <201308141019.53740@pali>
This patch is a supplement to commit
b253c9d1d858a3f115f791ee4fe2b9399ae7dbbd
Signed-off-by: Kyle Evans <kvans32@gmail.com>
---
drivers/platform/x86/hp-wmi.c | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 97bb05e..b65014f 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -35,6 +35,7 @@
#include <linux/input/sparse-keymap.h>
#include <linux/platform_device.h>
#include <linux/acpi.h>
+#include <linux/dmi.h>
#include <linux/rfkill.h>
#include <linux/string.h>
@@ -996,6 +997,17 @@ static struct platform_driver hp_wmi_driver = {
.remove = __exit_p(hp_wmi_bios_remove),
};
+static struct dmi_system_id __initdata tx2_dmi_table[] = {
+ {
+ .ident = "tx2",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "tx2"),
+ },
+ },
+ { }
+};
+
static int __init hp_wmi_init(void)
{
int err;
@@ -1010,7 +1022,9 @@ static int __init hp_wmi_init(void)
if (err)
return err;
- hp_wmi_enable_hotkeys();
+ if (dmi_check_system(tx2_dmi_table)) {
+ hp_wmi_enable_hotkeys();
+ {
}
if (bios_capable) {
--
1.7.3.4
prev parent reply other threads:[~2013-08-14 14:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-13 1:31 BUG: Fn keys not working on EliteBook 8460p after fabf85e3ca15d5b94058f391dac8df870cdd427a Pali Rohár
2013-04-13 1:35 ` Matthew Garrett
2013-04-13 12:36 ` Kyle Evans
2013-04-13 16:21 ` Matthew Garrett
2013-04-13 17:39 ` Kyle Evans
2013-04-13 17:42 ` Matthew Garrett
2013-04-16 16:26 ` Matthew Garrett
2013-04-17 13:56 ` Pali Rohár
2013-04-17 15:37 ` Kyle Evans
2013-04-17 17:59 ` Matthew Garrett
2013-04-17 18:55 ` Kyle Evans
2013-04-18 13:55 ` Kyle Evans
2013-04-18 15:58 ` Matthew Garrett
2013-04-18 16:48 ` Kyle Evans
2013-04-18 16:53 ` Matthew Garrett
2013-08-14 8:19 ` BUG: Again: Fn keys not working on EliteBook 8460p after b253c9d1d858a3f115f791ee4fe2b9399ae7dbbd Pali Rohár
2013-08-14 19:16 ` Kyle Evans [this message]
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=1376507803-7718-1-git-send-email-kvans32@gmail.com \
--to=kvans32@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=pali.rohar@gmail.com \
--cc=platform-driver-x86@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome