diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-08-16 21:10:56 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-08-16 21:10:56 +0300 |
| commit | 13fe7056bebb4015c6231a07a1be4d3aebbfe979 (patch) | |
| tree | 8aefa59a61c081c402bc85f2b47c17e1374eabdd /drivers/input/touchscreen/wdt87xx_i2c.c | |
| parent | ed9800100f1a70154c11cfa0ccc0b9ff51e3436a (diff) | |
| parent | 100294cee9a98bfd4d6cb2d1c8a8aef0e959b0c4 (diff) | |
| download | linux-13fe7056bebb4015c6231a07a1be4d3aebbfe979.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 4.19 merge window.
Diffstat (limited to 'drivers/input/touchscreen/wdt87xx_i2c.c')
| -rw-r--r-- | drivers/input/touchscreen/wdt87xx_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c index 20f7f3902757..166edeb77776 100644 --- a/drivers/input/touchscreen/wdt87xx_i2c.c +++ b/drivers/input/touchscreen/wdt87xx_i2c.c @@ -1142,7 +1142,7 @@ static int __maybe_unused wdt87xx_resume(struct device *dev) * The chip may have been reset while system is resuming, * give it some time to settle. */ - mdelay(100); + msleep(100); error = wdt87xx_send_command(client, VND_CMD_START, 0); if (error) |