summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-07-14 20:32:46 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-07-14 20:33:56 +0400
commitbbddd199995ff55f1bb0336cadff4ee3d02b5a2c (patch)
treeffc2f282465bd67ed58fa8f5451eef54b7650a14
parentc59690fa484c04ab96fe932241b569a09755a4d2 (diff)
downloadlinux-bbddd199995ff55f1bb0336cadff4ee3d02b5a2c.tar.xz
Input: synaptics - fix wrong dimensions check
The commit 83ba9ea8a04b72dfee2515428c15e7414ba4fc61 ommitted the return line for the old synaptics model accidentally. This resulted in a wrong check, namely, the dimensions are checked for the old devices that don't support the query properly. This patch adds the return line back. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/mouse/synaptics.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 40cea334ad13..9ba9c4a17e15 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -206,6 +206,7 @@ static int synaptics_resolution(struct psmouse *psmouse)
unsigned char max[3];
if (SYN_ID_MAJOR(priv->identity) < 4)
+ return 0;
if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res) == 0) {
if (res[0] != 0 && (res[1] & 0x80) && res[2] != 0) {