diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2008-10-28 23:53:19 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-29 00:28:50 -0400 |
commit | 3cf35049d8b2ccab62bbb8991ad1322ff2276840 (patch) | |
tree | 612bee3032f94e1cc99ff058d1e3474382052ed2 /drivers/input | |
parent | 09779678d12482024e06380cacc4c3ff2f129f23 (diff) |
Input: omap-keypad - interrupt disable fix
The GPIO interrupts are disabled several times after the first key press.
No need to disable - again - the interrupts in the omap_kp_scan_keypad
function on 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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 69e674ecf19a..a016c8d85a3d 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -122,10 +122,6 @@ static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state) | |||
122 | 122 | ||
123 | /* read the keypad status */ | 123 | /* read the keypad status */ |
124 | if (cpu_is_omap24xx()) { | 124 | if (cpu_is_omap24xx()) { |
125 | int i; | ||
126 | for (i = 0; i < omap_kp->rows; i++) | ||
127 | disable_irq(OMAP_GPIO_IRQ(row_gpios[i])); | ||
128 | |||
129 | /* read the keypad status */ | 125 | /* read the keypad status */ |
130 | for (col = 0; col < omap_kp->cols; col++) { | 126 | for (col = 0; col < omap_kp->cols; col++) { |
131 | set_col_gpio_val(omap_kp, ~(1 << col)); | 127 | set_col_gpio_val(omap_kp, ~(1 << col)); |