diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2008-10-28 23:53:25 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-29 00:28:58 -0400 |
commit | dde4ac07263161264d089c7556d0295487787b77 (patch) | |
tree | 095637b60bf63ee2b3935ca01ce6cfe8b2493119 /drivers/input | |
parent | 3cf35049d8b2ccab62bbb8991ad1322ff2276840 (diff) |
Input: omap-keypad - allow more than 6 rows
There is no reason to limit the GPIO rows to 6 for OMAP2.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index a016c8d85a3d..ec0ebee46069 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -125,7 +125,7 @@ static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state) | |||
125 | /* read the keypad status */ | 125 | /* read the keypad status */ |
126 | for (col = 0; col < omap_kp->cols; col++) { | 126 | for (col = 0; col < omap_kp->cols; col++) { |
127 | set_col_gpio_val(omap_kp, ~(1 << col)); | 127 | set_col_gpio_val(omap_kp, ~(1 << col)); |
128 | state[col] = ~(get_row_gpio_val(omap_kp)) & 0x3f; | 128 | state[col] = ~(get_row_gpio_val(omap_kp)) & 0xff; |
129 | } | 129 | } |
130 | set_col_gpio_val(omap_kp, 0); | 130 | set_col_gpio_val(omap_kp, 0); |
131 | 131 | ||