]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
OMAP2: omap-keypad: interrupt disable fix
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>
Thu, 2 Oct 2008 05:28:48 +0000 (08:28 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Oct 2008 22:01:40 +0000 (15:01 -0700)
The GPIO interrupts has been 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>
drivers/input/keyboard/omap-keypad.c

index d57d2cb718fc4867c8c48c5fb9fede04ebc996cc..d6cd79bf1fa70f2e9b8da57d3430c2d3c2681fe9 100644 (file)
@@ -134,10 +134,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));