git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', ...
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
touchscreen
/
stmpe-ts.c
diff --git
a/drivers/input/touchscreen/stmpe-ts.c
b/drivers/input/touchscreen/stmpe-ts.c
index 2d5ff86b343fbc30f1abf9e363333164311bfec6..e4c31256a74dbeddb70c74ec628ed856065cdff4 100644
(file)
--- a/
drivers/input/touchscreen/stmpe-ts.c
+++ b/
drivers/input/touchscreen/stmpe-ts.c
@@
-164,7
+164,7
@@
static irqreturn_t stmpe_ts_handler(int irq, void *data)
STMPE_TSC_CTRL_TSC_EN, STMPE_TSC_CTRL_TSC_EN);
/* start polling for touch_det to detect release */
- schedule_delayed_work(&ts->work,
HZ / 50
);
+ schedule_delayed_work(&ts->work,
msecs_to_jiffies(50)
);
return IRQ_HANDLED;
}