diff options
Diffstat (limited to 'drivers/input/keyboard/omap-keypad.c')
-rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 058fa8b02c2..87ec7b18ac6 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -100,8 +100,20 @@ static irqreturn_t omap_kp_interrupt(int irq, void *dev_id) | |||
100 | /* disable keyboard interrupt and schedule for handling */ | 100 | /* disable keyboard interrupt and schedule for handling */ |
101 | if (cpu_is_omap24xx()) { | 101 | if (cpu_is_omap24xx()) { |
102 | int i; | 102 | int i; |
103 | for (i = 0; i < omap_kp->rows; i++) | 103 | |
104 | disable_irq(gpio_to_irq(row_gpios[i])); | 104 | for (i = 0; i < omap_kp->rows; i++) { |
105 | int gpio_irq = gpio_to_irq(row_gpios[i]); | ||
106 | /* | ||
107 | * The interrupt which we're currently handling should | ||
108 | * be disabled _nosync() to avoid deadlocks waiting | ||
109 | * for this handler to complete. All others should | ||
110 | * be disabled the regular way for SMP safety. | ||
111 | */ | ||
112 | if (gpio_irq == irq) | ||
113 | disable_irq_nosync(gpio_irq); | ||
114 | else | ||
115 | disable_irq(gpio_irq); | ||
116 | } | ||
105 | } else | 117 | } else |
106 | /* disable keyboard interrupt and schedule for handling */ | 118 | /* disable keyboard interrupt and schedule for handling */ |
107 | omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); | 119 | omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); |