aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@nokia.com>2011-03-24 02:45:11 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-24 02:50:31 -0400
commit903427955b9ffe1ca4b76c510089774c3b7a4a8a (patch)
treeafa8c53b62bcf460203e6f9fd2648117b0443696 /drivers/input
parentddca6a31345cbea8c7c907e6b7e016339cbb6342 (diff)
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')
-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 437b9cdddf82..2a9a7260fe8e 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -358,7 +358,7 @@ static void __tsc2005_enable(struct tsc2005 *ts)
358 if (ts->esd_timeout && ts->set_reset) { 358 if (ts->esd_timeout && ts->set_reset) {
359 ts->last_valid_interrupt = jiffies; 359 ts->last_valid_interrupt = jiffies;
360 schedule_delayed_work(&ts->esd_work, 360 schedule_delayed_work(&ts->esd_work,
361 round_jiffies(jiffies + 361 round_jiffies_relative(
362 msecs_to_jiffies(ts->esd_timeout))); 362 msecs_to_jiffies(ts->esd_timeout)));
363 } 363 }
364 364
@@ -512,7 +512,7 @@ static void tsc2005_esd_work(struct work_struct *work)
512out: 512out:
513 /* re-arm the watchdog */ 513 /* re-arm the watchdog */
514 schedule_delayed_work(&ts->esd_work, 514 schedule_delayed_work(&ts->esd_work,
515 round_jiffies(jiffies + 515 round_jiffies_relative(
516 msecs_to_jiffies(ts->esd_timeout))); 516 msecs_to_jiffies(ts->esd_timeout)));
517 mutex_unlock(&ts->mutex); 517 mutex_unlock(&ts->mutex);
518} 518}