mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Corentin Chary <corentin.chary@gmail.com>
To: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: platform-driver-x86@vger.kernel.org,
	AceLan Kao <acelan.kao@canonical.com>,
	Corentin Chary <corentin.chary@gmail.com>,
	Matthew Garrett <mjg@redhat.com>,
	acpi4asus-user@lists.sourceforge.net,
	linux-kernel@vger.kernel.org
Subject: [PATCH 04/11] asus-laptop: correct a touchpad hotkey mapping
Date: Thu, 29 Nov 2012 09:12:32 +0100	[thread overview]
Message-ID: <1354176759-630-5-git-send-email-corentin.chary@gmail.com> (raw)
In-Reply-To: <1354176759-630-1-git-send-email-corentin.chary@gmail.com>

From: AceLan Kao <acelan.kao@canonical.com>

0x60 is touchpad enable key, but is misdefined in the keymap.

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
---
 drivers/platform/x86/asus-laptop.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 09c477a..73d0198 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -320,7 +320,7 @@ static const struct key_entry asus_keymap[] = {
 	{KE_KEY, 0x5D, { KEY_WLAN } }, /* WLAN Toggle */
 	{KE_KEY, 0x5E, { KEY_WLAN } }, /* WLAN Enable */
 	{KE_KEY, 0x5F, { KEY_WLAN } }, /* WLAN Disable */
-	{KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } },
+	{KE_KEY, 0x60, { KEY_TOUCHPAD_ON } },
 	{KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, /* LCD Only */
 	{KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, /* CRT Only */
 	{KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, /* LCD + CRT */
-- 
1.7.8.6


  parent reply	other threads:[~2012-11-29  8:13 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1354176759-630-1-git-send-email-corentin.chary@gmail.com>
2012-11-29  8:12 ` [PATCH 01/11] platform-drivers-x86: change my mail Corentin Chary
2012-11-29  8:12 ` [PATCH 02/11] asus-laptop: map some new keys Corentin Chary
2012-11-29  8:12 ` [PATCH 03/11] asus-{nb-wmi|laptop}.c: sync keymaps Corentin Chary
2012-11-29  8:12 ` Corentin Chary [this message]
2012-11-29  8:12 ` [PATCH 05/11] asus-laptop: add all video switch keys Corentin Chary
2012-11-29  8:12 ` [PATCH 06/11] asus-nb-wmi: correct a touchpad hotkey mapping Corentin Chary
2012-11-29  8:12 ` [PATCH 07/11] asus-nb-wmi: add all video switch keys Corentin Chary
2012-11-29  8:12 ` [PATCH 08/11] asus-wmi: add display toggle quirk Corentin Chary
2012-11-29  8:12 ` [PATCH 09/11] asus-laptop: Do not call HWRS on init Corentin Chary
2012-11-29 14:10   ` Ben Hutchings
2012-11-29  8:12 ` [PATCH 10/11] asus-wmi: always report brightness key events Corentin Chary
2012-11-29  8:12 ` [PATCH 11/11] asus-laptop: " Corentin Chary

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=1354176759-630-5-git-send-email-corentin.chary@gmail.com \
    --to=corentin.chary@gmail.com \
    --cc=acelan.kao@canonical.com \
    --cc=acpi4asus-user@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=mjg@redhat.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

all inboxes | Powered by JetHome®