1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index db22fd9b4cf..3f3d1198cdb 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -122,14 +122,10 @@ 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));
-                        state[col] = ~(get_row_gpio_val(omap_kp)) & 0x3f;
+                        state[col] = ~(get_row_gpio_val(omap_kp)) & 0xff;
                 }
                 set_col_gpio_val(omap_kp, 0);