[regression] 2.6.30 leaking keys on console switch

Commit Message

Dmitry Torokhov Oct. 14, 2009, 7:50 a.m. UTC

None

Patch

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 6ba676b..77fa3da 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -137,7 +137,7 @@  static void input_repeat_key(unsigned long data)
 	if (test_bit(dev->repeat_key, dev->key) &&
 	    is_event_supported(dev->repeat_key, dev->keybit, KEY_MAX)) {
 
-		input_pass_event(dev, EV_KEY, dev->repeat_key, 2);
+		input_pass_event(dev, EV_KEY, dev->repeat_key, 200);
 
 		if (dev->sync) {
 			/*
@@ -208,7 +208,15 @@  static void input_handle_event(struct input_dev *dev,
 		if (is_event_supported(code, dev->keybit, KEY_MAX) &&
 		    !!test_bit(code, dev->key) != value) {
 
-			if (value != 2) {
+			if (value == 2 || value == 200) {
+				/* autorepeat */
+				if (!test_bit(code, dev->key)) {
+					printk(KERN_ERR "%s autorepeat for released key %d\n",
+						value == 200 ? "software" : "hardware", code);
+					break;
+				}
+				value = 2;
+			} else {
 				__change_bit(code, dev->key);
 				if (value)
 					input_start_autorepeat(dev, code);