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/mouse/hgpk.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/mouse/hgpk.c')
| -rw-r--r-- | drivers/input/mouse/hgpk.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c index 62be888e83d0..015509e0b140 100644 --- a/drivers/input/mouse/hgpk.c +++ b/drivers/input/mouse/hgpk.c @@ -713,8 +713,7 @@ static int hgpk_toggle_powersave(struct psmouse *psmouse, int enable) * the upper bound. (in practice, it takes about 3 loops.) */ for (timeo = 20; timeo > 0; timeo--) { - if (!ps2_sendbyte(&psmouse->ps2dev, - PSMOUSE_CMD_DISABLE, 20)) + if (!ps2_sendbyte(ps2dev, PSMOUSE_CMD_DISABLE, 20)) break; msleep(25); } @@ -740,7 +739,7 @@ static int hgpk_toggle_powersave(struct psmouse *psmouse, int enable) psmouse_set_state(psmouse, PSMOUSE_IGNORE); /* probably won't see an ACK, the touchpad will be off */ - ps2_sendbyte(&psmouse->ps2dev, 0xec, 20); + ps2_sendbyte(ps2dev, 0xec, 20); } return 0; |