summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2008-10-28 23:53:19 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-10-29 00:28:50 -0400
commit3cf35049d8b2ccab62bbb8991ad1322ff2276840 (patch)
tree612bee3032f94e1cc99ff058d1e3474382052ed2
parent09779678d12482024e06380cacc4c3ff2f129f23 (diff)
downloadlinux-3.10-3cf35049d8b2ccab62bbb8991ad1322ff2276840.tar.gz
linux-3.10-3cf35049d8b2ccab62bbb8991ad1322ff2276840.tar.bz2
linux-3.10-3cf35049d8b2ccab62bbb8991ad1322ff2276840.zip
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>
-rw-r--r--drivers/input/keyboard/omap-keypad.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 69e674ecf19..a016c8d85a3 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)
/* read the keypad status */
if (cpu_is_omap24xx()) {
- int i;
- for (i = 0; i < omap_kp->rows; i++)
- disable_irq(OMAP_GPIO_IRQ(row_gpios[i]));
-
/* read the keypad status */
for (col = 0; col < omap_kp->cols; col++) {
set_col_gpio_val(omap_kp, ~(1 << col));