diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:50:02 -0400 |
| commit | 7a309490da98981558a07183786201f02a6341e2 (patch) | |
| tree | 204bfd3bc344dbb02be0b1eac29b956f6722e661 /drivers/input/touchscreen/tsc2007.c | |
| parent | 9a8709d44139748fe2e0ab56d20d8c384c8b65ad (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into x86/apic
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/touchscreen/tsc2007.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc2007.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 4ab070246892..536668fbda22 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
| @@ -235,7 +235,7 @@ static irqreturn_t tsc2007_irq(int irq, void *handle) | |||
| 235 | spin_lock_irqsave(&ts->lock, flags); | 235 | spin_lock_irqsave(&ts->lock, flags); |
| 236 | 236 | ||
| 237 | if (likely(ts->get_pendown_state())) { | 237 | if (likely(ts->get_pendown_state())) { |
| 238 | disable_irq(ts->irq); | 238 | disable_irq_nosync(ts->irq); |
| 239 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), | 239 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), |
| 240 | HRTIMER_MODE_REL); | 240 | HRTIMER_MODE_REL); |
| 241 | } | 241 | } |