svn commit: r187177 - in head/sys/dev/usb2: controller core

[Andrew Thompson]

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 at 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;