From: Chris Wright <chrisw@sous-sol.org>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgewood <reviews@ml.cw.f00f.org>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
Dmitry Torokhov <dtor_core@ameritech.net>,
Dmitry Torokhov <dtor@mail.ru>, Daniel Drake <dsd@gentoo.org>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 05/11] Input: psmouse - fix new device detection logic
Date: Fri, 02 Jun 2006 00:00:05 -0700 [thread overview]
Message-ID: <20060602194739.825347000@sous-sol.org> (raw)
In-Reply-To: <20060602194618.482948000@sous-sol.org>
[-- Attachment #1: input-psmouse-fix-new-device-detection-logic.patch --]
[-- Type: text/plain, Size: 1005 bytes --]
-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);
--
next prev parent reply other threads:[~2006-06-02 19:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-02 19:46 [PATCH 00/11] -stable review Chris Wright
2006-06-02 7:00 ` [PATCH 01/11] Altix: correct ioc4 port order Chris Wright
2006-06-02 7:00 ` [PATCH 02/11] Altix: correct ioc3 " Chris Wright
2006-06-02 7:00 ` [PATCH 03/11] Cpuset: might sleep checking zones allowed fix Chris Wright
2006-06-02 7:00 ` [PATCH 04/11] PowerMac: force only suspend-to-disk to be valid Chris Wright
2006-06-02 7:00 ` Chris Wright [this message]
2006-06-02 7:00 ` [PATCH 06/11] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices Chris Wright
2006-06-02 7:00 ` [PATCH 07/11] the latest consensus libata resume fix Chris Wright
2006-06-02 19:50 ` Jens Axboe
2006-06-02 20:02 ` Greg KH
2006-06-02 20:02 ` [stable] " Chris Wright
2006-06-03 8:49 ` Marcel Holtmann
2006-06-03 13:22 ` Jens Axboe
2006-06-03 17:41 ` Chris Wright
2006-06-02 7:00 ` [PATCH 08/11] ipw2200: Filter unsupported channels out in ad-hoc mode Chris Wright
2006-06-02 7:00 ` [PATCH 09/11] x86_64: x86_64 add crashdump trigger points Chris Wright
2006-06-02 7:00 ` [PATCH 10/11] x86_64: Dont do syscall exit tracing twice Chris Wright
2006-06-02 7:00 ` [PATCH 11/11] sbp2: backport read_capacity workaround for iPod Chris Wright
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=20060602194739.825347000@sous-sol.org \
--to=chrisw@sous-sol.org \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=dsd@gentoo.org \
--cc=dtor@mail.ru \
--cc=dtor_core@ameritech.net \
--cc=gregkh@suse.de \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/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
Powered by JetHome