Revert "WORKAROUND: mkbp: Remove KEY_BATTERY from valid keys."
authorTodd Broch <tbroch@chromium.org>
Fri, 19 Apr 2013 23:43:45 +0000 (16:43 -0700)
committerChromeBot <chrome-bot@google.com>
Mon, 22 Apr 2013 18:54:49 +0000 (11:54 -0700)
This reverts commit 20dd2301234bc0f57018e4b51380e53f652ac30c.

This temporary workaround eliminated bug introduced by commit:
  688c20f CHROMIUM: Strengthen ghosting algorithm.

That CL introduced a bug where the virtual key, KEY_BATTERY, falsely
ghosted to a bunch of other key sequences.  That change is also being
reverted.

Change-Id: I6e8959595cba088e6a55d45311fbe9534f3c75f5
Reviewed-on: https://gerrit.chromium.org/gerrit/48787
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Todd Broch <tbroch@chromium.org>
Tested-by: Todd Broch <tbroch@chromium.org>
drivers/input/keyboard/mkbp.c

index fafc34d..223a1a8 100644 (file)
@@ -384,7 +384,7 @@ static void __devinit mkbp_compute_valid_keys(struct mkbp_device *mkbp_dev)
        for (col = 0; col < MKBP_NUM_COLS; col++) {
                for (row = 0; row < MKBP_NUM_ROWS; row++) {
                        code = mkbp_keycodes[row][col];
-                       if (code && (code != KEY_BATTERY))
+                       if (code)
                                mkbp_dev->valid_keys[col] |= 1 << row;
                }
                dev_dbg(mkbp_dev->dev, "valid_keys[%02d] = 0x%02x\n",