From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 15:42:30 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F7FF16A420; Sun, 30 Sep 2007 15:42:30 +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 E9DCA16A417
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:42:29 +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 E099313C447
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:42:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UFgT6V005235
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:42:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UFgTPV005232
	for perforce@freebsd.org; Sun, 30 Sep 2007 15:42:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 30 Sep 2007 15:42:29 GMT
Message-Id: <200709301542.l8UFgTPV005232@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 127023 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: Sun, 30 Sep 2007 15:42:30 -0000

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

Change 127023 by hselasky@hselasky_laptop001 on 2007/09/30 15:42:01

	
	Store "use_polling" flag on the stack so that we don't
	access anything in the "xfer" structure in case the
	USB transfer should be cancelled.

Affected files ...

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

Differences ...

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

@@ -3326,6 +3326,7 @@
 	u_int16_t value;
 	u_int16_t index;
 	u_int8_t l;
+	uint8_t use_polling;
 
 	mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
 
@@ -3344,6 +3345,8 @@
 	value = UGETW(std->req.wValue);
 	index = UGETW(std->req.wIndex);
 
+	use_polling = xfer->flags.use_polling;
+
 	DPRINTFN(2,("type=0x%02x request=0x%02x wLen=0x%04x "
 		    "wValue=0x%04x wIndex=0x%04x\n",
 		    std->req.bmRequestType, std->req.bRequest,
@@ -3634,7 +3637,7 @@
 			v &= ~ (EHCI_PS_PE | EHCI_PS_PR);
 			EOWRITE4(sc, port, v | EHCI_PS_PR);
 
-			if (xfer->flags.use_polling) {
+			if (use_polling) {
 			    /* polling */
 			    DELAY(USB_PORT_ROOT_RESET_DELAY * 1000);
 			} else {
@@ -3647,7 +3650,7 @@
 			/* Terminate reset sequence. */
 			EOWRITE4(sc, port, v);
 
-			if (xfer->flags.use_polling) {
+			if (use_polling) {
 			    /* polling */
 			    DELAY(EHCI_PORT_RESET_COMPLETE * 1000);
 			} else {