diff options
| author |   David Moore <dcm@MIT.EDU> | 2005-07-11 01:07:48 -0500 |
|---|---|---|
| committer |   Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:07:48 -0500 |
| commit | b30dc120a7471a961272aeca24ede1c0530e6455 (patch) | |
| tree | 752a323f4917f2b999c42af9059a3fcc1bdea1bb /drivers/input/mouse/alps.c | |
| parent | Input: synaptics - limit rate to 40pps on Toshiba Dynabooks (diff) | |
| download | linux-dev-b30dc120a7471a961272aeca24ede1c0530e6455.tar.xz linux-dev-b30dc120a7471a961272aeca24ede1c0530e6455.zip | |
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/mouse/alps.c')
| -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) if (!(priv->i = alps_get_model(psmouse, &version))) return -1; - if (priv->i->flags & ALPS_PASS && alps_passthrough_mode(psmouse, 1)) + if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1)) return -1; if (alps_get_status(psmouse, param)) @@ -372,7 +372,7 @@ static int alps_reconnect(struct psmouse *psmouse) return -1; } - if (priv->i->flags == ALPS_PASS && alps_passthrough_mode(psmouse, 0)) + if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 0)) return -1; return 0; |