diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-20 15:16:02 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-20 15:16:02 -0800 |
| commit | 6e11617fcff3688f70650a3e40addb0043dda137 (patch) | |
| tree | a24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /drivers/input/misc/bma150.c | |
| parent | 722c5ac708b4f5c1fcfad5fed4c95234c8b06590 (diff) | |
| parent | a1b5359271e5c77d5ec8a575b379a6ba3e867097 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.11 merge window.
Diffstat (limited to 'drivers/input/misc/bma150.c')
| -rw-r--r-- | drivers/input/misc/bma150.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c index 2124390ec38c..1fa85379f86c 100644 --- a/drivers/input/misc/bma150.c +++ b/drivers/input/misc/bma150.c @@ -207,7 +207,7 @@ static int bma150_set_mode(struct bma150_data *bma150, u8 mode) return error; if (mode == BMA150_MODE_NORMAL) - msleep(2); + usleep_range(2000, 2100); bma150->mode = mode; return 0; @@ -222,7 +222,7 @@ static int bma150_soft_reset(struct bma150_data *bma150) if (error) return error; - msleep(2); + usleep_range(2000, 2100); return 0; } |