From: Peter Osterlund <petero2@telia.com>
To: Denis Vlasenko <vda@port.imtp.ilyichevsk.odessa.ua>
Cc: linux-kernel@vger.kernel.org,
Dmitry Torokhov <dtor_core@ameritech.net>,
Vojtech Pavlik <vojtech@suse.cz>, Andrew Morton <akpm@osdl.org>
Subject: Re: [PATCH] ALPS touchpad detection fix
Date: 07 Jan 2005 23:17:03 +0100 [thread overview]
Message-ID: <m3zmzk28bk.fsf@telia.com> (raw)
In-Reply-To: <200501071928.32096.vda@port.imtp.ilyichevsk.odessa.ua>
Denis Vlasenko <vda@port.imtp.ilyichevsk.odessa.ua> writes:
> On Thursday 06 January 2005 18:54, Peter Osterlund wrote:
> > My ALPS touchpad is not recognized because the device gets confused by
> > the Kensington ThinkingMouse probe. It responds with "00 00 14"
> > instead of the expected "00 00 64" to the "E6 report".
> >
> > Resetting the device before attempting the ALPS probe fixes the
> > problem.
> >
...
> > /*
> > * Try ALPS TouchPad
> > */
> > + ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
> > if (max_proto > PSMOUSE_IMEX && alps_detect(psmouse, set_properties) == 0) {
> > if (!set_properties || alps_init(psmouse) == 0)
> > return PSMOUSE_ALPS;
>
> You do reset even if max_proto <= PSMOUSE_IMEX and therefore
> alps_detect won't be called. Is it intended?
Not really intended. (It shouldn't harm though because the
mouse/touchpad is reset anyway before the IntelliMouse probe.)
Here is an updated patch that only does the reset when alps_detect()
is going to be called.
Signed-off-by: Peter Osterlund <petero2@telia.com>
---
linux-petero/drivers/input/mouse/psmouse-base.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff -puN drivers/input/mouse/psmouse-base.c~alps-fix drivers/input/mouse/psmouse-base.c
--- linux/drivers/input/mouse/psmouse-base.c~alps-fix 2005-01-06 22:43:28.000000000 +0100
+++ linux-petero/drivers/input/mouse/psmouse-base.c 2005-01-07 22:51:45.000000000 +0100
@@ -451,14 +451,16 @@ static int psmouse_extensions(struct psm
/*
* Try ALPS TouchPad
*/
- if (max_proto > PSMOUSE_IMEX && alps_detect(psmouse, set_properties) == 0) {
- if (!set_properties || alps_init(psmouse) == 0)
- return PSMOUSE_ALPS;
-
+ if (max_proto > PSMOUSE_IMEX) {
+ ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
+ if (alps_detect(psmouse, set_properties) == 0) {
+ if (!set_properties || alps_init(psmouse) == 0)
+ return PSMOUSE_ALPS;
/*
* Init failed, try basic relative protocols
*/
- max_proto = PSMOUSE_IMEX;
+ max_proto = PSMOUSE_IMEX;
+ }
}
if (max_proto > PSMOUSE_IMEX && genius_detect(psmouse, set_properties) == 0)
_
--
Peter Osterlund - petero2@telia.com
http://web.telia.com/~u89404340
prev parent reply other threads:[~2005-01-07 22:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-06 16:54 [PATCH] ALPS touchpad detection fix Peter Osterlund
2005-01-07 17:28 ` Denis Vlasenko
2005-01-07 22:17 ` Peter Osterlund [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3zmzk28bk.fsf@telia.com \
--to=petero2@telia.com \
--cc=akpm@osdl.org \
--cc=dtor_core@ameritech.net \
--cc=linux-kernel@vger.kernel.org \
--cc=vda@port.imtp.ilyichevsk.odessa.ua \
--cc=vojtech@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).