linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Henrik Rydberg" <rydberg@euromail.se>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Jiri Kosina <jkosina@suse.cz>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	Henrik Rydberg <rydberg@euromail.se>
Subject: [PATCH 05/20] Input: Make sure we follow all EV_KEY events
Date: Sun, 26 Aug 2012 14:57:23 +0200	[thread overview]
Message-ID: <1345985858-445-6-git-send-email-rydberg@euromail.se> (raw)
In-Reply-To: <1345985858-445-1-git-send-email-rydberg@euromail.se>

For some EV_KEY types, sending a larger-than-one value causes the
input state to oscillate. This patch makes sure this cannot happen,
clearing up the autorepeat bypass logic in the process.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
 drivers/input/input.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 8ebf116..4d64500 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -239,24 +239,30 @@ static void input_handle_event(struct input_dev *dev,
 		break;
 
 	case EV_KEY:
-		if (is_event_supported(code, dev->keybit, KEY_MAX) &&
-		    !!test_bit(code, dev->key) != value) {
+		if (is_event_supported(code, dev->keybit, KEY_MAX)) {
+
+			/* auto-repeat bypasses state updates */
+			if (value == 2) {
+				disposition = INPUT_PASS_TO_HANDLERS;
+				break;
+			}
+
+			if (!!test_bit(code, dev->key) != !!value) {
 
-			if (value != 2) {
 				__change_bit(code, dev->key);
+				disposition = INPUT_PASS_TO_HANDLERS;
+
 				if (value)
 					input_start_autorepeat(dev, code);
 				else
 					input_stop_autorepeat(dev);
 			}
-
-			disposition = INPUT_PASS_TO_HANDLERS;
 		}
 		break;
 
 	case EV_SW:
 		if (is_event_supported(code, dev->swbit, SW_MAX) &&
-		    !!test_bit(code, dev->sw) != value) {
+		    !!test_bit(code, dev->sw) != !!value) {
 
 			__change_bit(code, dev->sw);
 			disposition = INPUT_PASS_TO_HANDLERS;
@@ -283,7 +289,7 @@ static void input_handle_event(struct input_dev *dev,
 
 	case EV_LED:
 		if (is_event_supported(code, dev->ledbit, LED_MAX) &&
-		    !!test_bit(code, dev->led) != value) {
+		    !!test_bit(code, dev->led) != !!value) {
 
 			__change_bit(code, dev->led);
 			disposition = INPUT_PASS_TO_ALL;
-- 
1.7.12


  parent reply	other threads:[~2012-08-26 12:53 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-26 12:57 [PATCH v2 00/20] Input and HID updates for 3.7 Henrik Rydberg
2012-08-26 12:57 ` [PATCH 01/20] Input: bcm5974 - Only setup button urb for TYPE1 devices Henrik Rydberg
2012-08-26 12:57 ` [PATCH 02/20] Input: Break out MT data Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 03/20] Input: Improve the events-per-packet estimate Henrik Rydberg
2012-08-26 12:57 ` [PATCH 04/20] Input: Remove redundant packet estimates Henrik Rydberg
2012-08-26 12:57 ` Henrik Rydberg [this message]
2012-08-26 12:57 ` [PATCH 06/20] Input: Move autorepeat to the event-passing phase Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 07/20] Input: Send events one packet at a time Henrik Rydberg
2012-08-26 12:57 ` [PATCH 08/20] Input: evdev - Add the events() callback Henrik Rydberg
2012-08-26 12:57 ` [PATCH 09/20] Input: MT - Add flags to input_mt_init_slots() Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 10/20] Input: MT - Handle frame synchronization in core Henrik Rydberg
2012-08-26 12:57 ` [PATCH 11/20] Input: MT - Add in-kernel tracking Henrik Rydberg
2012-08-26 12:57 ` [PATCH 12/20] Input: MT - Add slot assignment by id Henrik Rydberg
2012-08-26 12:57 ` [PATCH 13/20] Input: bcm5974 - Preparatory renames Henrik Rydberg
2012-08-26 12:57 ` [PATCH 14/20] Input: bcm5974 - Drop pressure and width emulation Henrik Rydberg
2012-08-26 12:57 ` [PATCH 15/20] Input: bcm5974 - Drop the logical dimensions Henrik Rydberg
2012-08-26 12:57 ` [PATCH 16/20] Input: bcm5974 - Convert to MT-B Henrik Rydberg
2012-08-26 12:57 ` [PATCH 17/20] HID: Only dump input if someone is listening Henrik Rydberg
2012-08-26 12:57 ` [PATCH 18/20] HID: Add an input configured notification callback Henrik Rydberg
2012-08-26 12:57 ` [PATCH 19/20] HID: hid-debug: Show rdesc for unclaimed devices Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 20/20] HID: multitouch: Remove the redundant touch state Henrik Rydberg
2012-08-29 15:18   ` Benjamin Tissoires
2012-08-29 16:02     ` Henrik Rydberg
2012-08-30 18:34     ` Henrik Rydberg

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=1345985858-445-6-git-send-email-rydberg@euromail.se \
    --to=rydberg@euromail.se \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).