From owner-svn-src-all@FreeBSD.ORG  Tue Jan 13 19:01:57 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8156A106578C;
	Tue, 13 Jan 2009 19:01:57 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 37A4C8FC20;
	Tue, 13 Jan 2009 19:01:57 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DJ1vWW012139;
	Tue, 13 Jan 2009 19:01:57 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DJ1vkT012138;
	Tue, 13 Jan 2009 19:01:57 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200901131901.n0DJ1vkT012138@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Tue, 13 Jan 2009 19:01:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187166 - head/sys/dev/usb2/core
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2009 19:01:59 -0000

Author: thompsa
Date: Tue Jan 13 19:01:56 2009
New Revision: 187166
URL: http://svn.freebsd.org/changeset/base/187166

Log:
  MFp4: //depot/projects/usb@155755
  
  	Fix a race causing the explore thread to
  	hang when tearing down USB transfers at
  	detach.
  
  Submitted by: Hans Petter Selasky

Modified:
  head/sys/dev/usb2/core/usb2_transfer.c

Modified: head/sys/dev/usb2/core/usb2_transfer.c
==============================================================================
--- head/sys/dev/usb2/core/usb2_transfer.c	Tue Jan 13 19:01:46 2009	(r187165)
+++ head/sys/dev/usb2/core/usb2_transfer.c	Tue Jan 13 19:01:56 2009	(r187166)
@@ -1915,8 +1915,7 @@ usb2_callback_wrapper(struct usb2_xfer_q
 
 	/*
 	 * Check if we got started after that we got cancelled, but
-	 * before we managed to do the callback. Check if we are
-	 * draining.
+	 * before we managed to do the callback.
 	 */
 	if ((!xfer->flags_int.open) &&
 	    (xfer->flags_int.started) &&
@@ -1924,13 +1923,19 @@ usb2_callback_wrapper(struct usb2_xfer_q
 		/* try to loop, but not recursivly */
 		usb2_command_wrapper(&info->done_q, xfer);
 		return;
-	} else if (xfer->flags_int.draining &&
+	}
+
+done:
+	/*
+	 * Check if we are draining.
+	 */
+	if (xfer->flags_int.draining &&
 	    (!xfer->flags_int.transferring)) {
 		/* "usb2_transfer_drain()" is waiting for end of transfer */
 		xfer->flags_int.draining = 0;
 		usb2_cv_broadcast(&xfer->usb2_root->cv_drain);
 	}
-done:
+
 	/* do the next callback, if any */
 	usb2_command_wrapper(&info->done_q,
 	    info->done_q.curr);