From owner-p4-projects@FreeBSD.ORG  Thu Jan 28 17:07:04 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2402E106568D; Thu, 28 Jan 2010 17:07:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DCA261065670
	for <perforce@FreeBSD.org>; Thu, 28 Jan 2010 17:07:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CA1F48FC3E
	for <perforce@FreeBSD.org>; Thu, 28 Jan 2010 17:07:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SH73vm085172
	for <perforce@FreeBSD.org>; Thu, 28 Jan 2010 17:07:03 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SH73oS085170
	for perforce@freebsd.org; Thu, 28 Jan 2010 17:07:03 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 28 Jan 2010 17:07:03 GMT
Message-Id: <201001281707.o0SH73oS085170@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173848 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2010 17:07:04 -0000

http://p4web.freebsd.org/chv.cgi?CH=173848

Change 173848 by hselasky@hselasky_laptop001 on 2010/01/28 17:06:32

	USB input:
		- improve last patch
	
	PR:		usb/143286, kern/141011

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#42 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#42 (text+ko) ====

@@ -517,10 +517,11 @@
 
 	ukbd_interrupt(sc);
 
-	if (ukbd_any_key_pressed(sc)) {
-		if (ukbd_is_polling(sc) == 0)
-			ukbd_event_keyinput(sc);
+	/* Make sure any leftover key events gets read out */
+	if (ukbd_is_polling(sc) == 0)
+		ukbd_event_keyinput(sc);
 
+	if (ukbd_any_key_pressed(sc) || (sc->sc_inputs != 0)) {
 		ukbd_start_timer(sc);
 	} else {
 		sc->sc_flags &= ~UKBD_FLAG_TIMER_RUNNING;
@@ -1662,6 +1663,7 @@
 		ukbd_is_polling(sc);	/* update state */
 	} else {
 		sc->sc_flags &= ~UKBD_FLAG_POLLING;
+		ukbd_start_timer(sc);	/* start timer */
 	}
 	return (0);
 }