From owner-p4-projects@FreeBSD.ORG  Sat Jan 10 17:43:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42D21106567B; Sat, 10 Jan 2009 17:43:57 +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 F399F106564A
	for <perforce@freebsd.org>; Sat, 10 Jan 2009 17:43:56 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E16B58FC21
	for <perforce@freebsd.org>; Sat, 10 Jan 2009 17:43:56 +0000 (UTC)
	(envelope-from thompsa@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 n0AHhufV010404
	for <perforce@freebsd.org>; Sat, 10 Jan 2009 17:43:56 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AHhuOD010402
	for perforce@freebsd.org; Sat, 10 Jan 2009 17:43:56 GMT
	(envelope-from thompsa@freebsd.org)
Date: Sat, 10 Jan 2009 17:43:56 GMT
Message-Id: <200901101743.n0AHhuOD010402@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 155923 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: Sat, 10 Jan 2009 17:43:58 -0000

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

Change 155923 by thompsa@thompsa_burger on 2009/01/10 17:43:06

	Fix remaining xfer->udev variable changes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#23 (text+ko) ====

@@ -1025,7 +1025,7 @@
 
 	DPRINTF("xfer=%p\n", xfer);
 
-	USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
+	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
 	/* transfer is transferred */
 	at91dci_device_done(xfer, USB_ERR_TIMEOUT);

==== //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#2 (text+ko) ====

@@ -918,7 +918,7 @@
 
 	DPRINTF("xfer=%p\n", xfer);
 
-	USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
+	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
 	/* transfer is transferred */
 	atmegadci_device_done(xfer, USB_ERR_TIMEOUT);

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

@@ -72,7 +72,7 @@
 		DPRINTF("xfer gone\n");
 		return;
 	}
-	USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
+	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
 	std->xfer = NULL;