summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-05-19 15:07:39 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:03:32 +0200
commitf176161e930c7961b4254c5d85168d0ce164d31a (patch)
tree2a37d589828cfc005f3fb3e74ef50089fd64334b
parent5ee7f15ed5a429c085ab8c0083d2fad1cc1ee384 (diff)
db5500-keypad: fix ROW_SHIFT
ROW_SHIFT is based on the number of columns, and should be 3 since there are only 8 columns. This also prevents this driver from writing beyond its allocated memory. ST-Ericsson Linux next: - ST-Ericsson ID: WP257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I9cb8e08ee6a008760071fd411fefde33f20cf9af Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23385 Tested-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Naveen Kumar GADDIPATI <naveen.gaddipati@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
-rw-r--r--drivers/input/keyboard/db5500_keypad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/db5500_keypad.c b/drivers/input/keyboard/db5500_keypad.c
index 8767b7f81ba..8a127eaa94c 100644
--- a/drivers/input/keyboard/db5500_keypad.c
+++ b/drivers/input/keyboard/db5500_keypad.c
@@ -37,7 +37,7 @@
#define KEYPAD_MAX_ROWS 9
#define KEYPAD_MAX_COLS 8
-#define KEYPAD_ROW_SHIFT 4
+#define KEYPAD_ROW_SHIFT 3
#define KEYPAD_KEYMAP_SIZE \
(KEYPAD_MAX_ROWS * KEYPAD_MAX_COLS)