* [PATCH] input: Fix wrong dimensions check for synaptics
@ 2010-07-14 15:27 Takashi Iwai
2010-07-14 16:32 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Iwai @ 2010-07-14 15:27 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input, linux-kernel
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>
---
drivers/input/mouse/synaptics.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 40cea33..9ba9c4a 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) {
--
1.7.0.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] input: Fix wrong dimensions check for synaptics
2010-07-14 15:27 [PATCH] input: Fix wrong dimensions check for synaptics Takashi Iwai
@ 2010-07-14 16:32 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2010-07-14 16:32 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-input, linux-kernel
On Wed, Jul 14, 2010 at 05:27:33PM +0200, Takashi Iwai wrote:
> 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.
Oops. Thanks Takashi, applied.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-14 16:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-14 15:27 [PATCH] input: Fix wrong dimensions check for synaptics Takashi Iwai
2010-07-14 16:32 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).