From owner-p4-projects@FreeBSD.ORG  Fri Mar 27 22:09:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F61D1065674; Fri, 27 Mar 2009 22:09:55 +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 BEC9D106566B
	for <perforce@FreeBSD.org>; Fri, 27 Mar 2009 22:09:54 +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 2206F8FC12
	for <perforce@FreeBSD.org>; Fri, 27 Mar 2009 22:09:54 +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 n2RM9sfM074402
	for <perforce@FreeBSD.org>; Fri, 27 Mar 2009 22:09:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2RM9sef074400
	for perforce@freebsd.org; Fri, 27 Mar 2009 22:09:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 27 Mar 2009 22:09:54 GMT
Message-Id: <200903272209.n2RM9sef074400@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 159931 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, 27 Mar 2009 22:09:57 -0000

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

Change 159931 by hselasky@hselasky_laptop001 on 2009/03/27 22:09:12

	
	USB CORE:
	  - fix regression issue:
	    - Root HUB was not displayed by USB config.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#138 edit

Differences ...

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

@@ -305,16 +305,16 @@
 
 	(methods->pipe_init) (udev, edesc, pipe);
 
-	/* check for invalid pipe */
-	if (pipe->methods == NULL)
-		return;
-
 	/* initialise USB pipe structure */
 	pipe->edesc = edesc;
 	pipe->iface_index = iface_index;
 	TAILQ_INIT(&pipe->pipe_q.head);
 	pipe->pipe_q.command = &usb2_pipe_start;
 
+	/* the pipe is not supported by the hardware */
+ 	if (pipe->methods == NULL)
+		return;
+
 	/* clear stall, if any */
 	if (methods->clear_stall != NULL) {
 		USB_BUS_LOCK(udev->bus);

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

@@ -846,7 +846,7 @@
 			pipe = usb2_get_pipe(udev,
 			    ifaces[setup->if_index], setup);
 
-			if (!pipe) {
+			if ((pipe == NULL) || (pipe->methods == NULL)) {
 				if (setup->flags.no_pipe_ok)
 					continue;
 				if ((setup->usb_mode != USB_MODE_MAX) &&