diff options
| author | David Moore <dcm@MIT.EDU> | 2005-07-11 02:07:48 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 02:07:48 -0400 |
| commit | b30dc120a7471a961272aeca24ede1c0530e6455 (patch) | |
| tree | 752a323f4917f2b999c42af9059a3fcc1bdea1bb /drivers/input | |
| parent | 9ba5eaafa1bff1d2dc7f6b9fb4cc6e313dcd6105 (diff) | |
Input: ALPS - fix resume (for DualPoints)
The driver would not reset pass-through mode when performing
resume of a DualPoint touchpad causing it to stop working
until next reboot.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/alps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index a12e98158a75..33e7198cb05c 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
| @@ -358,7 +358,7 @@ static int alps_reconnect(struct psmouse *psmouse) | |||
| 358 | if (!(priv->i = alps_get_model(psmouse, &version))) | 358 | if (!(priv->i = alps_get_model(psmouse, &version))) |
| 359 | return -1; | 359 | return -1; |
| 360 | 360 | ||
| 361 | if (priv->i->flags & ALPS_PASS && alps_passthrough_mode(psmouse, 1)) | 361 | if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1)) |
| 362 | return -1; | 362 | return -1; |
| 363 | 363 | ||
| 364 | if (alps_get_status(psmouse, param)) | 364 | if (alps_get_status(psmouse, param)) |
| @@ -372,7 +372,7 @@ static int alps_reconnect(struct psmouse *psmouse) | |||
| 372 | return -1; | 372 | return -1; |
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | if (priv->i->flags == ALPS_PASS && alps_passthrough_mode(psmouse, 0)) | 375 | if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 0)) |
| 376 | return -1; | 376 | return -1; |
| 377 | 377 | ||
| 378 | return 0; | 378 | return 0; |