Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5440
b: refs/heads/master
c: b30dc12
h: refs/heads/master
v: v3
  • Loading branch information
David Moore authored and Dmitry Torokhov committed Jul 11, 2005
1 parent 5634742 commit eb559de
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9ba5eaafa1bff1d2dc7f6b9fb4cc6e313dcd6105
refs/heads/master: b30dc120a7471a961272aeca24ede1c0530e6455
4 changes: 2 additions & 2 deletions trunk/drivers/input/mouse/alps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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;
Expand Down

0 comments on commit eb559de

Please sign in to comment.