---

yaml --- r: 143538 b: refs/heads/master c: 3f3e7c6 h: refs/heads/master v: v3
git-mirror · Apr 16, 2009 · 1d56b6f · 1d56b6f
1 parent 349a589
commit 1d56b6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 180deb50880cdc5e9dd69ec97af0d6e72c5417fc
+refs/heads/master: 3f3e7c6e139f704e2f48ea3b45ff7724a8d46456
diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c
@@ -754,7 +754,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle)
 			 * that here.  (The "generic irq" framework may help...)
 			 */
 			ts->irq_disabled = 1;
-			disable_irq(ts->spi->irq);
+			disable_irq_nosync(ts->spi->irq);
 			ts->pending = 1;
 			hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY),
 					HRTIMER_MODE_REL);