From owner-p4-projects@FreeBSD.ORG  Tue Dec 23 19:16:44 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38A281065679; Tue, 23 Dec 2008 19:16:44 +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 F2DA11065676
	for <perforce@FreeBSD.org>; Tue, 23 Dec 2008 19:16:43 +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 E04468FC21
	for <perforce@FreeBSD.org>; Tue, 23 Dec 2008 19:16:43 +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 mBNJGhAe026914
	for <perforce@FreeBSD.org>; Tue, 23 Dec 2008 19:16:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNJGh5m026912
	for perforce@freebsd.org; Tue, 23 Dec 2008 19:16:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 23 Dec 2008 19:16:43 GMT
Message-Id: <200812231916.mBNJGh5m026912@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 155193 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, 23 Dec 2008 19:16:44 -0000

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

Change 155193 by hselasky@hselasky_laptop001 on 2008/12/23 19:16:34

	
	Be more persistant towards set config failures.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#41 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#41 (text+ko) ====

@@ -1556,6 +1556,7 @@
 	if (udev->flags.usb2_mode == USB_MODE_HOST) {
 		uint8_t config_index;
 		uint8_t config_quirk;
+		uint8_t set_config_failed = 0;
 
 		/*
 		 * Most USB devices should attach to config index 0 by
@@ -1591,6 +1592,14 @@
 		sx_unlock(udev->default_sx + 1);
 		if (err) {
 			if (udev->ddesc.bNumConfigurations != 0) {
+				if (!set_config_failed) {
+					set_config_failed = 1;
+					/* XXX try to re-enumerate the device */
+					err = usb2_req_re_enumerate(
+					    udev, &Giant);
+					if (err == 0)
+					    goto repeat_set_config;
+				}
 				DPRINTFN(0, "Failure selecting "
 				    "configuration index %u: %s, port %u, "
 				    "addr %u (ignored)\n",
@@ -1598,7 +1607,7 @@
 				    udev->address);
 			}
 			/*
-			 * Some USB devices does not have any
+			 * Some USB devices do not have any
 			 * configurations. Ignore any set config
 			 * failures!
 			 */