From owner-p4-projects@FreeBSD.ORG  Tue May 12 06:39:53 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8849D1065675; Tue, 12 May 2009 06:39:53 +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 47064106566C
	for <perforce@FreeBSD.org>; Tue, 12 May 2009 06:39:53 +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 35CB48FC1D
	for <perforce@FreeBSD.org>; Tue, 12 May 2009 06:39:53 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4C6dreI026286
	for <perforce@FreeBSD.org>; Tue, 12 May 2009 06:39:53 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4C6drRs026284
	for perforce@freebsd.org; Tue, 12 May 2009 06:39:53 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 12 May 2009 06:39:53 GMT
Message-Id: <200905120639.n4C6drRs026284@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 161961 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: Tue, 12 May 2009 06:39:54 -0000

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

Change 161961 by hselasky@hselasky_laptop001 on 2009/05/12 06:38:57

	
	USB CORE:
	 - Cancelled error code must be returned in special
	 case, else device drivers might end up in infinite loop.
	 - The special case code was introduced by a recent commit.
	
	Bug report by: Andrey <andrey.kosachenko@gmail.com>

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#144 edit

Differences ...

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

@@ -1439,7 +1439,11 @@
 	/* Check if the device is still alive */
 	if (info->udev->state < USB_STATE_POWERED) {
 		USB_BUS_LOCK(bus);
-		usb2_transfer_done(xfer, USB_ERR_NOT_CONFIGURED);
+		/*
+		 * Must return cancelled error code else
+		 * device drivers can hang.
+		 */
+		usb2_transfer_done(xfer, USB_ERR_CANCELLED);
 		USB_BUS_UNLOCK(bus);
 		return;
 	}