1c1
< /* $FreeBSD: head/sys/dev/usb2/core/usb2_request.c 186730 2009-01-04 00:12:01Z alfred $ */
---
> /* $FreeBSD: head/sys/dev/usb2/core/usb2_request.c 187173 2009-01-13 19:03:12Z thompsa $ */
83c83
< usb2_cv_signal(xfer->udev->default_cv);
---
> usb2_cv_signal(xfer->xroot->udev->default_cv);
96a97
> struct usb2_device *udev;
102c103
< USB_BUS_LOCK(xfer->udev->bus);
---
> udev = xfer->xroot->udev;
103a105,106
> USB_BUS_LOCK(udev->bus);
>
106,108c109,111
< pipe = xfer->udev->pipe_curr;
< pipe_end = xfer->udev->pipes + USB_EP_MAX;
< pipe_first = xfer->udev->pipes;
---
> pipe = udev->pipe_curr;
> pipe_end = udev->pipes + USB_EP_MAX;
> pipe_first = udev->pipes;
148c151
< USB_BUS_UNLOCK(xfer->udev->bus);
---
> USB_BUS_UNLOCK(udev->bus);
152c155
< USB_BUS_LOCK(xfer->udev->bus);
---
> USB_BUS_LOCK(udev->bus);
168,169c171,172
< xfer->udev->pipe_curr = pipe;
< USB_BUS_UNLOCK(xfer->udev->bus);
---
> udev->pipe_curr = pipe;
> USB_BUS_UNLOCK(udev->bus);
370c373,374
< xfer->xfer_mtx, temp);
---
> xfer->xroot->xfer_mtx,
> temp);
387,388c391,392
< usb2_cv_wait(xfer->udev->default_cv,
< xfer->xfer_mtx);
---
> usb2_cv_wait(udev->default_cv,
> xfer->xroot->xfer_mtx);