diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-28 14:03:48 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-28 14:03:48 +0100 |
commit | f7cbe205471976a23e3caabda0139f93277c2877 (patch) | |
tree | 8c71507911722595731853f8b67add46abb78b5e /drivers | |
parent | 835538a3a13001fcf6ccc0655161310b7bd44a3d (diff) | |
parent | 1cc4fff0b360aeffeedb7d6db5089d88dd861700 (diff) |
Merge branch 'timers/hrtimers' into auto-timers-next
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/touchscreen/ads7846.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index b9b7fc6ff1eb..e1ece89fe922 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -697,7 +697,7 @@ static enum hrtimer_restart ads7846_timer(struct hrtimer *handle) struct ads7846 *ts = container_of(handle, struct ads7846, timer); int status = 0; - spin_lock_irq(&ts->lock); + spin_lock(&ts->lock); if (unlikely(!get_pendown_state(ts) || device_suspended(&ts->spi->dev))) { @@ -728,7 +728,7 @@ static enum hrtimer_restart ads7846_timer(struct hrtimer *handle) dev_err(&ts->spi->dev, "spi_async --> %d\n", status); } - spin_unlock_irq(&ts->lock); + spin_unlock(&ts->lock); return HRTIMER_NORESTART; } |