projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddca6a3
)
Input: tsc2005 - use relative jiffies to schedule the watchdog
author
Aaro Koskinen
<
[email protected]
>
Thu, 24 Mar 2011 06:45:11 +0000
(23:45 -0700)
committer
Dmitry Torokhov
<
[email protected]
>
Thu, 24 Mar 2011 06:50:31 +0000
(23:50 -0700)
Use relative jiffies to schedule the watchdog. Otherwise it will run
like a mad one.
Signed-off-by: Aaro Koskinen <
[email protected]
>
Signed-off-by: Dmitry Torokhov <
[email protected]
>
drivers/input/touchscreen/tsc2005.c
patch
|
blob
|
history
diff --git
a/drivers/input/touchscreen/tsc2005.c
b/drivers/input/touchscreen/tsc2005.c
index 437b9cdddf825048a11ca8dc2633748d73c6f215..2a9a7260fe8eb961f405dce3fde9daa0b6ff6efd 100644
(file)
--- 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);
}