summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@nokia.com>2011-03-24 06:45:11 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-24 06:50:31 (GMT)
commit903427955b9ffe1ca4b76c510089774c3b7a4a8a (patch)
treeafa8c53b62bcf460203e6f9fd2648117b0443696 /drivers/input/touchscreen
parentddca6a31345cbea8c7c907e6b7e016339cbb6342 (diff)
downloadlinux-903427955b9ffe1ca4b76c510089774c3b7a4a8a.tar.xz
Input: tsc2005 - use relative jiffies to schedule the watchdog
Use relative jiffies to schedule the watchdog. Otherwise it will run like a mad one. Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/tsc2005.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 437b9cd..2a9a726 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -358,7 +358,7 @@ static void __tsc2005_enable(struct tsc2005 *ts)
if (ts->esd_timeout && ts->set_reset) {
ts->last_valid_interrupt = jiffies;
schedule_delayed_work(&ts->esd_work,
- round_jiffies(jiffies +
+ round_jiffies_relative(
msecs_to_jiffies(ts->esd_timeout)));
}
@@ -512,7 +512,7 @@ static void tsc2005_esd_work(struct work_struct *work)
out:
/* re-arm the watchdog */
schedule_delayed_work(&ts->esd_work,
- round_jiffies(jiffies +
+ round_jiffies_relative(
msecs_to_jiffies(ts->esd_timeout)));
mutex_unlock(&ts->mutex);
}