1c1
< /* $FreeBSD: head/sys/dev/usb2/controller/musb2_otg.c 184610 2008-11-04 02:31:03Z alfred $ */
---
> /* $FreeBSD: head/sys/dev/usb2/controller/musb2_otg.c 184824 2008-11-10 20:54:31Z thompsa $ */
224c224
< use_polling = mtx_owned(xfer->priv_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;
236c236
< usb2_pause_mtx(&sc->sc_bus.mtx, 8);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 8);
985c985
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1010c1010
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1024c1024
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1119c1119
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1276c1276
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1281c1281
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1359c1359
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1519c1519
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
1705c1705
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
1744c1744
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1752c1752
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
1765c1765
< usb2_pause_mtx(&sc->sc_bus.mtx, 10);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 10);
1874c1874
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1886c1886
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1902c1902
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1924c1924
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1927c1927
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
2296c2296
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
2312c2312
< use_polling = mtx_owned(xfer->priv_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;