Patchwork [13/13] Revert "UBUNTU: SAUCE: Catch nonsense keycodes and silently ignore"

login
register
mail settings
Submitter Leann Ogasawara
Date May 21, 2010, 11:18 p.m.
Message ID <1274483928.19284.3338.camel@emiko>
Download mbox | patch
Permalink /patch/53228/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 21, 2010, 11:18 p.m.
>From 6c74aa26db9d5cee77b14916da3c98fe89fcec21 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 21 May 2010 15:18:46 -0700
Subject: [PATCH 13/13] Revert "UBUNTU: SAUCE: Catch nonsense keycodes and silently ignore"

This reverts commit 9e5f474af95b738fbadbc19d80b6494086b51c83.

Drop this patch for Maverick as it is no longer necessary.
emulate_raw() now catches key codes of 0 and drops them.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/char/keyboard.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 8d6c600..ada25bb 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1085,8 +1085,6 @@  static int emulate_raw(struct vc_data *vc, unsigned int keycode,
 	int code;
 
 	switch (keycode) {
-		case KEY_RESERVED:
-			break;
 		case KEY_PAUSE:
 			put_queue(vc, 0xe1);
 			put_queue(vc, 0x1d | up_flag);
@@ -1144,8 +1142,6 @@  static int emulate_raw(struct vc_data *vc, unsigned int keycode,
 
 static int emulate_raw(struct vc_data *vc, unsigned int keycode, unsigned char up_flag)
 {
-	if (keycode == KEY_RESERVED)
-		return 0;
 	if (keycode > 127)
 		return -1;