diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:45:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:45:18 +1100 |
| commit | 20530516281e94d873ce9ebf7f7365ed241cf9a6 (patch) | |
| tree | 23fa46e3808b38551114cd0c2ab7051e3d2419e4 /drivers/input/keyboard/omap-keypad.c | |
| parent | fbda7f6f2981a3e8972f9c8c38d7ef291d8c1eb9 (diff) | |
| parent | a2d781fc8d9b16113dd9440107d73c0f21d7cbef (diff) | |
Merge commit 'input/next'
Diffstat (limited to 'drivers/input/keyboard/omap-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 69e674ecf19a..ec0ebee46069 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); |