From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Thu, 24 Mar 2011 06:45:11 +0000 (-0700)
Subject: Input: tsc2005 - use relative jiffies to schedule the watchdog
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=903427955b9ffe1ca4b76c510089774c3b7a4a8a;p=deliverable%2Flinux.git

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>
---

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)
 	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);
 }