Re: 2.6.1-mm3
From: Dmitry Torokhov
Date: Wed Jan 14 2004 - 08:08:20 EST
On Wednesday 14 January 2004 04:48 am, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.1/2.6
> +psmouse-drop-timed-out-bytes.patch
Andrew,
Could you please queue this one for your next -mm - first attempt was too
eager at complaining - it's ok to have timeout while we probing ports, etc.
so warnings should only be produced if mouse is in active state.
The patch depends on the one you have.
Dmitry
===================================================================
ChangeSet@xxxxxx, 2004-01-10 23:50:51-05:00, dtor_core@xxxxxxxxxxxxx
Input: Change the way timeouts/parity errors are handled:
- Only complain about errors from keyboard controller if mouse
is activated
- Reset packet count to 0 as the next received byte will most
likely be the first byte of a new packet
- If expecting an ACK from the mouse set NACK condition
psmouse-base.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
===================================================================
diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c Sat Jan 10 23:55:28 2004
+++ b/drivers/input/mouse/psmouse-base.c Sat Jan 10 23:55:28 2004
@@ -122,9 +122,15 @@
goto out;
if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
- printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
- flags & SERIO_TIMEOUT ? " timeout" : "",
- flags & SERIO_PARITY ? " bad parity" : "");
+ if (psmouse->state == PSMOUSE_ACTIVATED)
+ printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
+ flags & SERIO_TIMEOUT ? " timeout" : "",
+ flags & SERIO_PARITY ? " bad parity" : "");
+ if (psmouse->acking) {
+ psmouse->ack = -1;
+ psmouse->acking = 0;
+ }
+ psmouse->pktcnt = 0;
goto out;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/