From c88bd237446095d5cba351ae94aef8ac3e107d36 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Wed, 23 Mar 2011 23:45:11 -0700
Subject: [PATCH] --- yaml --- r: 242556 b: refs/heads/master c:
 903427955b9ffe1ca4b76c510089774c3b7a4a8a h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/input/touchscreen/tsc2005.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 41f390e2a9fa..e6f1e0dbd8b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddca6a31345cbea8c7c907e6b7e016339cbb6342
+refs/heads/master: 903427955b9ffe1ca4b76c510089774c3b7a4a8a
diff --git a/trunk/drivers/input/touchscreen/tsc2005.c b/trunk/drivers/input/touchscreen/tsc2005.c
index 437b9cdddf82..2a9a7260fe8e 100644
--- a/trunk/drivers/input/touchscreen/tsc2005.c
+++ b/trunk/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);
 }