From owner-p4-projects@FreeBSD.ORG  Fri Jan 19 22:57:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B46B16A407; Fri, 19 Jan 2007 22:57:09 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DA9AD16A405
	for <perforce@FreeBSD.org>; Fri, 19 Jan 2007 22:57:08 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id BBB9713C441
	for <perforce@FreeBSD.org>; Fri, 19 Jan 2007 22:57:08 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0JMv8VI012287
	for <perforce@FreeBSD.org>; Fri, 19 Jan 2007 22:57:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0JMv8aM012284
	for perforce@freebsd.org; Fri, 19 Jan 2007 22:57:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 19 Jan 2007 22:57:08 GMT
Message-Id: <200701192257.l0JMv8aM012284@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>
Cc: 
Subject: PERFORCE change 113184 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Fri, 19 Jan 2007 22:57:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=113184

Change 113184 by hselasky@hselasky_mini_itx on 2007/01/19 22:56:34

	Fix another bug introduced by change 113175. If the transfer
	descriptor is active, return the previous "status" value when
	when for loop exits in "ehci_non_isoc_done()".

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ehci.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ehci.c#18 (text+ko) ====

@@ -1037,6 +1037,7 @@
 static void
 ehci_non_isoc_done(struct usbd_xfer *xfer)
 {
+	uint32_t temp;
 	u_int32_t status = 0;
 	u_int32_t actlen = 0;
 	u_int16_t len = 0;
@@ -1058,19 +1059,21 @@
 	     td = td->obj_next)
 	{
 		usbd_page_sync(td->page, BUS_DMASYNC_PREREAD);
-		status = le32toh(td->qtd_status);
+		temp = le32toh(td->qtd_status);
 		usbd_page_sync(td->page, BUS_DMASYNC_POSTREAD);
 
-		if (status & EHCI_QTD_ACTIVE) {
+		if (temp & EHCI_QTD_ACTIVE) {
 
 			/* if there are left over TDs 
 			 * the toggle needs to be updated
 			 */
 			xfer->pipe->toggle_next =
-			  (status & EHCI_QTD_SET_TOGGLE(1)) ? 1 : 0;
+			  (temp & EHCI_QTD_SET_TOGGLE(1)) ? 1 : 0;
 			break;
 		}
 
+		status = temp;
+
 		len = EHCI_QTD_GET_BYTES(status);
 
 		if (len <= td->len) {