summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2009-01-13 19:04:12 +0000
committerthompsa <thompsa@FreeBSD.org>2009-01-13 19:04:12 +0000
commitf5ecfaa16f461c143199eed147daa12b2d96cf24 (patch)
treeb62453944e48a3cfc64ab309c7dc61b63573438a
parentb1d0bacc6a02bbf7d239be34106924d571c8414a (diff)
downloadFreeBSD-src-f5ecfaa16f461c143199eed147daa12b2d96cf24.zip
FreeBSD-src-f5ecfaa16f461c143199eed147daa12b2d96cf24.tar.gz
MFp4: //depot/projects/usb@155923
Fix remaining xfer->udev variable changes. Submitted by: Hans Petter Selasky
-rw-r--r--sys/dev/usb2/controller/at91dci.c2
-rw-r--r--sys/dev/usb2/core/usb2_sw_transfer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb2/controller/at91dci.c b/sys/dev/usb2/controller/at91dci.c
index 9ab9710..4b53051 100644
--- a/sys/dev/usb2/controller/at91dci.c
+++ b/sys/dev/usb2/controller/at91dci.c
@@ -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);
diff --git a/sys/dev/usb2/core/usb2_sw_transfer.c b/sys/dev/usb2/core/usb2_sw_transfer.c
index e88ffc8..23f89ba 100644
--- a/sys/dev/usb2/core/usb2_sw_transfer.c
+++ b/sys/dev/usb2/core/usb2_sw_transfer.c
@@ -72,7 +72,7 @@ usb2_sw_transfer(struct usb2_sw_transfer *std,
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;
OpenPOWER on IntegriCloud