From acdbf1dd955ad45c1dd49652deb1d96ddc1509c3 Mon Sep 17 00:00:00 2001 From: Ben Nizette Date: Fri, 17 Apr 2009 20:35:57 -0700 Subject: [PATCH] --- yaml --- r: 144407 b: refs/heads/master c: 29fa98bd9b50b5e9c17d99e961640ffafb765d71 h: refs/heads/master i: 144405: db59621607d10e52bc6722b30a74441f41b71876 144403: 61d58906a6056679bbc39ab9d7561e066d7af021 144399: fde6946465be0ea059ee94a3c766b9fe0d28b019 v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/tsc2007.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1e0936323a5b..3ad5e9948997 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4bd3e591c8cc52ccf7a0b27f33aa7a5a19058d7 +refs/heads/master: 29fa98bd9b50b5e9c17d99e961640ffafb765d71 diff --git a/trunk/drivers/input/touchscreen/tsc2007.c b/trunk/drivers/input/touchscreen/tsc2007.c index 4ab070246892..536668fbda22 100644 --- a/trunk/drivers/input/touchscreen/tsc2007.c +++ b/trunk/drivers/input/touchscreen/tsc2007.c @@ -235,7 +235,7 @@ static irqreturn_t tsc2007_irq(int irq, void *handle) spin_lock_irqsave(&ts->lock, flags); if (likely(ts->get_pendown_state())) { - disable_irq(ts->irq); + disable_irq_nosync(ts->irq); hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), HRTIMER_MODE_REL); }