diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /drivers/input/mouse/sentelic.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mouse/sentelic.c')
| -rw-r--r-- | drivers/input/mouse/sentelic.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c index e36847de7617..2a77a52d2e62 100644 --- a/drivers/input/mouse/sentelic.c +++ b/drivers/input/mouse/sentelic.c | |||
| @@ -90,8 +90,7 @@ static int fsp_reg_read(struct psmouse *psmouse, int reg_addr, int *reg_val) | |||
| 90 | * to do that for writes because sysfs set helper does this for | 90 | * to do that for writes because sysfs set helper does this for |
| 91 | * us. | 91 | * us. |
| 92 | */ | 92 | */ |
| 93 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE); | 93 | psmouse_deactivate(psmouse); |
| 94 | psmouse_set_state(psmouse, PSMOUSE_CMD_MODE); | ||
| 95 | 94 | ||
| 96 | ps2_begin_command(ps2dev); | 95 | ps2_begin_command(ps2dev); |
| 97 | 96 | ||
| @@ -128,8 +127,7 @@ static int fsp_reg_read(struct psmouse *psmouse, int reg_addr, int *reg_val) | |||
| 128 | 127 | ||
| 129 | out: | 128 | out: |
| 130 | ps2_end_command(ps2dev); | 129 | ps2_end_command(ps2dev); |
| 131 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE); | 130 | psmouse_activate(psmouse); |
| 132 | psmouse_set_state(psmouse, PSMOUSE_ACTIVATED); | ||
| 133 | dev_dbg(&ps2dev->serio->dev, "READ REG: 0x%02x is 0x%02x (rc = %d)\n", | 131 | dev_dbg(&ps2dev->serio->dev, "READ REG: 0x%02x is 0x%02x (rc = %d)\n", |
| 134 | reg_addr, *reg_val, rc); | 132 | reg_addr, *reg_val, rc); |
| 135 | return rc; | 133 | return rc; |
| @@ -213,8 +211,7 @@ static int fsp_page_reg_read(struct psmouse *psmouse, int *reg_val) | |||
| 213 | unsigned char param[3]; | 211 | unsigned char param[3]; |
| 214 | int rc = -1; | 212 | int rc = -1; |
| 215 | 213 | ||
| 216 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE); | 214 | psmouse_deactivate(psmouse); |
| 217 | psmouse_set_state(psmouse, PSMOUSE_CMD_MODE); | ||
| 218 | 215 | ||
| 219 | ps2_begin_command(ps2dev); | 216 | ps2_begin_command(ps2dev); |
| 220 | 217 | ||
| @@ -239,8 +236,7 @@ static int fsp_page_reg_read(struct psmouse *psmouse, int *reg_val) | |||
| 239 | 236 | ||
| 240 | out: | 237 | out: |
| 241 | ps2_end_command(ps2dev); | 238 | ps2_end_command(ps2dev); |
| 242 | ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE); | 239 | psmouse_activate(psmouse); |
| 243 | psmouse_set_state(psmouse, PSMOUSE_ACTIVATED); | ||
| 244 | dev_dbg(&ps2dev->serio->dev, "READ PAGE REG: 0x%02x (rc = %d)\n", | 240 | dev_dbg(&ps2dev->serio->dev, "READ PAGE REG: 0x%02x (rc = %d)\n", |
| 245 | *reg_val, rc); | 241 | *reg_val, rc); |
| 246 | return rc; | 242 | return rc; |