From owner-svn-src-all@FreeBSD.ORG  Tue Jan 13 19:04:12 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 71A181065692;
	Tue, 13 Jan 2009 19:04:12 +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 5D7058FC20;
	Tue, 13 Jan 2009 19:04:12 +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 n0DJ4CmK012687;
	Tue, 13 Jan 2009 19:04:12 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DJ4CJD012685;
	Tue, 13 Jan 2009 19:04:12 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200901131904.n0DJ4CJD012685@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Tue, 13 Jan 2009 19:04:12 +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: r187177 - in head/sys/dev/usb2: controller 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:04:13 -0000

Author: thompsa
Date: Tue Jan 13 19:04:12 2009
New Revision: 187177
URL: http://svn.freebsd.org/changeset/base/187177

Log:
  MFp4: //depot/projects/usb@155923
  
  	Fix remaining xfer->udev variable changes.
  
  Submitted by: Hans Petter Selasky

Modified:
  head/sys/dev/usb2/controller/at91dci.c
  head/sys/dev/usb2/core/usb2_sw_transfer.c

Modified: head/sys/dev/usb2/controller/at91dci.c
==============================================================================
--- head/sys/dev/usb2/controller/at91dci.c	Tue Jan 13 19:03:47 2009	(r187176)
+++ head/sys/dev/usb2/controller/at91dci.c	Tue Jan 13 19:04:12 2009	(r187177)
@@ -1025,7 +1025,7 @@ at91dci_timeout(void *arg)
 
 	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);

Modified: head/sys/dev/usb2/core/usb2_sw_transfer.c
==============================================================================
--- head/sys/dev/usb2/core/usb2_sw_transfer.c	Tue Jan 13 19:03:47 2009	(r187176)
+++ head/sys/dev/usb2/core/usb2_sw_transfer.c	Tue Jan 13 19:04:12 2009	(r187177)
@@ -72,7 +72,7 @@ usb2_sw_transfer(struct usb2_sw_transfer
 		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;