[PATCH] Input: fix wrong synaptics detection in psmouse_extensions()

[PATCH] Input: fix wrong synaptics detection in psmouse_extensions()

[Jiri Kosina]

Commit b7802c5c1ea ("Input: psmouse - use boolean type") caused the 
synaptics_hardware variable to be completely useless, as it is constantly 
set to 'true' throughout the whole psmouse_extensions(). This was caused 
by the following hunk in the commit in question

	-       int synaptics_hardware = 0;
	+       bool synaptics_hardware = true;

which is wrong. Fix that up.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

--- 
 drivers/input/mouse/psmouse-base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 690aed9..b7eccc2 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -581,7 +581,7 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties)
 static int psmouse_extensions(struct psmouse *psmouse,
 			      unsigned int max_proto, bool set_properties)
 {
-	bool synaptics_hardware = true;
+	bool synaptics_hardware = false;
 
 /*
  * We always check for lifebook because it does not disturb mouse

Re: [PATCH] Input: fix wrong synaptics detection in psmouse_extensions()

[Dmitry Torokhov]

On Mon, Nov 16, 2009 at 12:51:30PM +0100, Jiri Kosina wrote:
> Commit b7802c5c1ea ("Input: psmouse - use boolean type") caused the 
> synaptics_hardware variable to be completely useless, as it is constantly 
> set to 'true' throughout the whole psmouse_extensions(). This was caused 
> by the following hunk in the commit in question
> 
> 	-       int synaptics_hardware = 0;
> 	+       bool synaptics_hardware = true;
> 
> which is wrong. Fix that up.

Hmm, not sure what I was thinnking at that time but it is obviously I
should have stayed away form tehe keyboard...

Applied, thank you Jiri.

-- 
Dmitry

Re: [PATCH] Input: fix wrong synaptics detection in psmouse_extensions()

[Jiri Kosina]

[ fixed linux-input CC which I have typoed previously ]

On Mon, 16 Nov 2009, Dmitry Torokhov wrote:

> On Mon, Nov 16, 2009 at 12:51:30PM +0100, Jiri Kosina wrote:
> > Commit b7802c5c1ea ("Input: psmouse - use boolean type") caused the 
> > synaptics_hardware variable to be completely useless, as it is constantly 
> > set to 'true' throughout the whole psmouse_extensions(). This was caused 
> > by the following hunk in the commit in question
> > 
> > 	-       int synaptics_hardware = 0;
> > 	+       bool synaptics_hardware = true;
> > 
> > which is wrong. Fix that up.
> 
> Hmm, not sure what I was thinnking at that time but it is obviously I
> should have stayed away form tehe keyboard...
> 
> Applied, thank you Jiri.

I guess you will be pushing that one to .32 still, right? I think it's 
quite crucial fix, so if it doesn't make it in time for .32 (I am not sure 
whether Linus will be doing next -rc or not), it should go to -stable for 
.32 right away.

Thanks!

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: [PATCH] Input: fix wrong synaptics detection in psmouse_extensions()

[Dmitry Torokhov]

On Mon, Nov 16, 2009 at 06:12:39PM +0100, Jiri Kosina wrote:
> 
> [ fixed linux-input CC which I have typoed previously ]
> 
> On Mon, 16 Nov 2009, Dmitry Torokhov wrote:
> 
> > On Mon, Nov 16, 2009 at 12:51:30PM +0100, Jiri Kosina wrote:
> > > Commit b7802c5c1ea ("Input: psmouse - use boolean type") caused the 
> > > synaptics_hardware variable to be completely useless, as it is constantly 
> > > set to 'true' throughout the whole psmouse_extensions(). This was caused 
> > > by the following hunk in the commit in question
> > > 
> > > 	-       int synaptics_hardware = 0;
> > > 	+       bool synaptics_hardware = true;
> > > 
> > > which is wrong. Fix that up.
> > 
> > Hmm, not sure what I was thinnking at that time but it is obviously I
> > should have stayed away form tehe keyboard...
> > 
> > Applied, thank you Jiri.
> 
> I guess you will be pushing that one to .32 still, right? 

Yes, I will try to get it in .32

> I think it's 
> quite crucial fix, so if it doesn't make it in time for .32 (I am not sure 
> whether Linus will be doing next -rc or not), it should go to -stable for 
> .32 right away.

Actually it is not that critical, it will only cause us to do an
unnecessary full reset when every protocol detection failed and we
resort to the bare PS/2 protocol. Still  the fix is tiny so might as
well do stable if it misses release.

-- 
Dmitry