aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorBen Nizette <bn@niasdigital.com>2009-04-15 21:57:55 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-04-15 22:02:46 -0400
commit3f3e7c6e139f704e2f48ea3b45ff7724a8d46456 (patch)
tree6469ac9fd16de0ef86bc0cdd6a66cfad7d901b31 /drivers/input
parent180deb50880cdc5e9dd69ec97af0d6e72c5417fc (diff)
Input: ads7846 - fix unsafe disable_irq
The use of disable_irq inside the handler for the interrupt being disabled has always been dangerous. disable_irq should wait for that handler to complete before returning -> deadlock. For some reason this wasn't actually the case until 3aa551c9b was merged but since this time, the ads7846 driver has deadlocked the system on first interrupt. Convert the driver to use the handler-safe _nosync variant. Signed-off-by: Ben Nizette <bn@niasdigital.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ads7846.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index cf7e69766b2b..8b6e30ac2919 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -754,7 +754,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle)
754 * that here. (The "generic irq" framework may help...) 754 * that here. (The "generic irq" framework may help...)
755 */ 755 */
756 ts->irq_disabled = 1; 756 ts->irq_disabled = 1;
757 disable_irq(ts->spi->irq); 757 disable_irq_nosync(ts->spi->irq);
758 ts->pending = 1; 758 ts->pending = 1;
759 hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), 759 hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY),
760 HRTIMER_MODE_REL); 760 HRTIMER_MODE_REL);