1c1
< /* $FreeBSD: head/sys/dev/usb2/controller/usb2_controller.c 184610 2008-11-04 02:31:03Z alfred $ */
---
> /* $FreeBSD: head/sys/dev/usb2/controller/usb2_controller.c 184824 2008-11-10 20:54:31Z thompsa $ */
147c147
< mtx_lock(&bus->mtx);
---
> USB_BUS_LOCK(bus);
157c157
< mtx_unlock(&bus->mtx);
---
> USB_BUS_UNLOCK(bus);
190c190
< mtx_unlock(&bus->mtx);
---
> USB_BUS_UNLOCK(bus);
202c202
< mtx_lock(&bus->mtx);
---
> USB_BUS_LOCK(bus);
224c224
< mtx_unlock(&bus->mtx);
---
> USB_BUS_UNLOCK(bus);
239c239
< mtx_lock(&bus->mtx);
---
> USB_BUS_LOCK(bus);
323c323
< &bus->mtx, USB_PRI_MED)) {
---
> &bus->bus_mtx, USB_PRI_MED)) {
435c435
< mtx_init(&bus->mtx, "USB lock",
---
> mtx_init(&bus->bus_mtx, "USB bus lock",
441c441
< dmat, &bus->mtx, NULL, NULL, 32, USB_BUS_DMA_TAG_MAX);
---
> dmat, &bus->bus_mtx, NULL, NULL, 32, USB_BUS_DMA_TAG_MAX);
474c474
< mtx_destroy(&bus->mtx);
---
> mtx_destroy(&bus->bus_mtx);