Messages in this thread Patch in this message | | | Date | Fri, 02 Jun 2006 00:00:05 -0700 | From | Chris Wright <> | Subject | [PATCH 05/11] Input: psmouse - fix new device detection logic |
| |
-stable review patch. If anyone has any objections, please let us know. ------------------
From: Dmitry Torokhov <dtor_core@ameritech.net>
Reported to fix http://bugs.gentoo.org/130846
Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Cc: Daniel Drake <dsd@gentoo.org> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---
drivers/input/mouse/psmouse-base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- linux-2.6.16.19.orig/drivers/input/mouse/psmouse-base.c +++ linux-2.6.16.19/drivers/input/mouse/psmouse-base.c @@ -300,8 +300,10 @@ static irqreturn_t psmouse_interrupt(str * Check if this is a new device announcement (0xAA 0x00) */ if (unlikely(psmouse->packet[0] == PSMOUSE_RET_BAT && psmouse->pktcnt <= 2)) { - if (psmouse->pktcnt == 1) + if (psmouse->pktcnt == 1) { + psmouse->last = jiffies; goto out; + } if (psmouse->packet[1] == PSMOUSE_RET_ID) { __psmouse_set_state(psmouse, PSMOUSE_IGNORE); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |