diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 16:02:36 (GMT) |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-11 16:02:36 (GMT) |
commit | 53431d0a3534263168c8ee576bad1c2c3a4cd9e0 (patch) | |
tree | 84b3dda2e2409d1eda7c2273053c78cd6aa3a677 /drivers/input/touchscreen/elants_i2c.c | |
parent | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (diff) | |
parent | ade9c1a47c811a7ae1c874882ad9178af1ed1098 (diff) | |
download | linux-53431d0a3534263168c8ee576bad1c2c3a4cd9e0.tar.xz |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/input/touchscreen/elants_i2c.c')
-rw-r--r-- | drivers/input/touchscreen/elants_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index ddac134..17cc20e 100644 --- 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 10000 +#define ELAN_CALI_TIMEOUT_MSEC 12000 #define ELAN_POWERON_DELAY_USEC 500 #define ELAN_RESET_DELAY_MSEC 20 |