* [patch 19/22] input: elantech touchpad driver miss-recognising logitech mice
@ 2009-03-04 19:59 akpm
2009-03-04 20:24 ` Arjan Opmeer
0 siblings, 1 reply; 3+ messages in thread
From: akpm @ 2009-03-04 19:59 UTC (permalink / raw)
To: dtor; +Cc: linux-input, akpm, arjan, apw
From: Arjan Opmeer <arjan@opmeer.net>
Some Logitech mice react to the magic knock like an Elantech touchpad would.
This leads to those mice being misdetected as Elantech touchpads. Add a
version query to elantech_detect() to distinguish the two.
Signed-off-by: Arjan Opmeer <arjan@opmeer.net>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/input/mouse/elantech.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff -puN drivers/input/mouse/elantech.c~input-elantech-touchpad-driver-miss-recognising-logitech-mice drivers/input/mouse/elantech.c
--- a/drivers/input/mouse/elantech.c~input-elantech-touchpad-driver-miss-recognising-logitech-mice
+++ a/drivers/input/mouse/elantech.c
@@ -567,14 +567,27 @@ int elantech_detect(struct psmouse *psmo
return -1;
}
- pr_debug("elantech.c: Elantech version query result 0x%02x, 0x%02x, 0x%02x.\n",
- param[0], param[1], param[2]);
-
if (param[0] == 0 || param[1] != 0) {
pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n");
return -1;
}
+ /*
+ * There are Logitech mice that react to the magic knock exactly
+ * like an Elantech touchpad would, so do a version query here to
+ * try to distinguish the two
+ */
+ if (synaptics_send_cmd(psmouse, ETP_FW_VERSION_QUERY, param)) {
+ pr_err("elantech.c: failed to query firmware version.\n");
+ return -1;
+ }
+ pr_info("elantech.c: Elantech version query result 0x%02x, 0x%02x, 0x%02x.\n",
+ param[0], param[1], param[2]);
+ if (param[0] == 0 || param[1] != 0) {
+ pr_info("elantech.c: Probably not a real Elantech touchpad. Aborting.\n");
+ return -1;
+ }
+
if (set_properties) {
psmouse->vendor = "Elantech";
psmouse->name = "Touchpad";
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 19/22] input: elantech touchpad driver miss-recognising logitech mice
2009-03-04 19:59 [patch 19/22] input: elantech touchpad driver miss-recognising logitech mice akpm
@ 2009-03-04 20:24 ` Arjan Opmeer
2009-03-04 20:39 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Arjan Opmeer @ 2009-03-04 20:24 UTC (permalink / raw)
To: akpm; +Cc: dtor, linux-input, apw
On Wed, Mar 04, 2009 at 11:59:09AM -0800, akpm@linux-foundation.org wrote:
> From: Arjan Opmeer <arjan@opmeer.net>
>
> Some Logitech mice react to the magic knock like an Elantech touchpad
> would. This leads to those mice being misdetected as Elantech touchpads.
> Add a version query to elantech_detect() to distinguish the two.
Andrew, I am confused. To what should this patch apply? Notice the version
query result debug print that gets removed and added. The test for a real
touchpad that now exists twice.
> Signed-off-by: Arjan Opmeer <arjan@opmeer.net>
> Cc: Andy Whitcroft <apw@shadowen.org>
> Cc: Dmitry Torokhov <dtor@mail.ru>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> drivers/input/mouse/elantech.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff -puN drivers/input/mouse/elantech.c~input-elantech-touchpad-driver-miss-recognising-logitech-mice drivers/input/mouse/elantech.c
> --- a/drivers/input/mouse/elantech.c~input-elantech-touchpad-driver-miss-recognising-logitech-mice
> +++ a/drivers/input/mouse/elantech.c
> @@ -567,14 +567,27 @@ int elantech_detect(struct psmouse *psmo
> return -1;
> }
>
> - pr_debug("elantech.c: Elantech version query result 0x%02x, 0x%02x, 0x%02x.\n",
> - param[0], param[1], param[2]);
> -
> if (param[0] == 0 || param[1] != 0) {
> pr_debug("elantech.c: Probably not a real Elantech touchpad. Aborting.\n");
> return -1;
> }
>
> + /*
> + * There are Logitech mice that react to the magic knock exactly
> + * like an Elantech touchpad would, so do a version query here to
> + * try to distinguish the two
> + */
> + if (synaptics_send_cmd(psmouse, ETP_FW_VERSION_QUERY, param)) {
> + pr_err("elantech.c: failed to query firmware version.\n");
> + return -1;
> + }
> + pr_info("elantech.c: Elantech version query result 0x%02x, 0x%02x, 0x%02x.\n",
> + param[0], param[1], param[2]);
> + if (param[0] == 0 || param[1] != 0) {
> + pr_info("elantech.c: Probably not a real Elantech touchpad. Aborting.\n");
> + return -1;
> + }
> +
> if (set_properties) {
> psmouse->vendor = "Elantech";
> psmouse->name = "Touchpad";
> _
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 19/22] input: elantech touchpad driver miss-recognising logitech mice
2009-03-04 20:24 ` Arjan Opmeer
@ 2009-03-04 20:39 ` Andrew Morton
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2009-03-04 20:39 UTC (permalink / raw)
To: Arjan Opmeer; +Cc: dtor, linux-input, apw
On Wed, 4 Mar 2009 21:24:35 +0100
Arjan Opmeer <arjan@opmeer.net> wrote:
> On Wed, Mar 04, 2009 at 11:59:09AM -0800, akpm@linux-foundation.org wrote:
> > From: Arjan Opmeer <arjan@opmeer.net>
> >
> > Some Logitech mice react to the magic knock like an Elantech touchpad
> > would. This leads to those mice being misdetected as Elantech touchpads.
> > Add a version query to elantech_detect() to distinguish the two.
>
> Andrew, I am confused. To what should this patch apply? Notice the version
> query result debug print that gets removed and added. The test for a real
> touchpad that now exists twice.
It appears that the patch already was appiled (woo-hooo!) but it still
applied on top of itself. It happens sometimes.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-04 20:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-04 19:59 [patch 19/22] input: elantech touchpad driver miss-recognising logitech mice akpm
2009-03-04 20:24 ` Arjan Opmeer
2009-03-04 20:39 ` Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.