]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Input: omap-keypad - interrupt disable fix
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>
Wed, 29 Oct 2008 03:53:19 +0000 (23:53 -0400)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 29 Oct 2008 04:28:50 +0000 (00:28 -0400)
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>
drivers/input/keyboard/omap-keypad.c

index 69e674ecf19a1b26ed9f0db46d9c176c5d43d273..a016c8d85a3df9c5de36016317711ddc576c9b51 100644 (file)
@@ -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));