projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
touchscreen
/
elants_i2c.c
diff --git
a/drivers/input/touchscreen/elants_i2c.c
b/drivers/input/touchscreen/elants_i2c.c
index ddac134b25b108841e7e7797003fe9a6725e4576..17cc20ef4923bdb2fb2edcf770d7c303be9d6af5 100644
(file)
--- a/
drivers/input/touchscreen/elants_i2c.c
+++ b/
drivers/input/touchscreen/elants_i2c.c
@@
-102,7
+102,7
@@
#define ELAN_FW_PAGESIZE 132
/* calibration timeout definition */
-#define ELAN_CALI_TIMEOUT_MSEC 1
0
000
+#define ELAN_CALI_TIMEOUT_MSEC 1
2
000
#define ELAN_POWERON_DELAY_USEC 500
#define ELAN_RESET_DELAY_MSEC 20