From 9b6bbd09d2d4dc3dbdc5b16b761215acc1988a5e Mon Sep 17 00:00:00 2001
From: Ben Nizette <bn@niasdigital.com>
Date: Fri, 17 Apr 2009 20:35:58 -0700
Subject: [PATCH] --- yaml --- r: 144408 b: refs/heads/master c:
 3deb649e654ff87b87de9e415ac43ca8afbdff07 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/input/touchscreen/ucb1400_ts.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3ad5e9948997..f18210e47bf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29fa98bd9b50b5e9c17d99e961640ffafb765d71
+refs/heads/master: 3deb649e654ff87b87de9e415ac43ca8afbdff07
diff --git a/trunk/drivers/input/touchscreen/ucb1400_ts.c b/trunk/drivers/input/touchscreen/ucb1400_ts.c
index e868264fe799..f100c7f4c1db 100644
--- a/trunk/drivers/input/touchscreen/ucb1400_ts.c
+++ b/trunk/drivers/input/touchscreen/ucb1400_ts.c
@@ -256,7 +256,7 @@ static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)
 	struct ucb1400_ts *ucb = devid;
 
 	if (irqnr == ucb->irq) {
-		disable_irq(ucb->irq);
+		disable_irq_nosync(ucb->irq);
 		ucb->irq_pending = 1;
 		wake_up(&ucb->ts_wait);
 		return IRQ_HANDLED;