diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-04-05 18:18:47 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-04-05 18:18:47 +0000 |
| commit | c1fafa98d746b197b7c9797fe8f043ea2f6d921c (patch) | |
| tree | 13db9863ebfd93dda1f6a8754f177bd10de0273a | |
| parent | e287ad4395b645f94ed91c8706ab53e19884a791 (diff) | |
| download | FreeBSD-src-c1fafa98d746b197b7c9797fe8f043ea2f6d921c.zip FreeBSD-src-c1fafa98d746b197b7c9797fe8f043ea2f6d921c.tar.gz | |
MFp4 //depot/projects/usb@159700
Get rid of the last CALLOUT_RETURNUNLOCKED reference.
Submitted by: Hans Petter Selasky
| -rw-r--r-- | sys/dev/usb/controller/usb_controller.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index bea3e77..84066a2 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -277,7 +277,7 @@ usb2_power_wdog(void *arg) usb2_bus_power_update(bus); - return; + USB_BUS_LOCK(bus); } /*------------------------------------------------------------------------* @@ -356,11 +356,8 @@ usb2_bus_attach(struct usb2_proc_msg *pm) /* set softc - we are ready */ device_set_softc(dev, bus); - /* start watchdog - this function will unlock the BUS lock ! */ + /* start watchdog */ usb2_power_wdog(bus); - - /* need to return locked */ - USB_BUS_LOCK(bus); } /*------------------------------------------------------------------------* @@ -534,7 +531,7 @@ usb2_bus_mem_alloc_all(struct usb2_bus *bus, bus_dma_tag_t dmat, NULL, MTX_DEF | MTX_RECURSE); usb2_callout_init_mtx(&bus->power_wdog, - &bus->bus_mtx, CALLOUT_RETURNUNLOCKED); + &bus->bus_mtx, 0); TAILQ_INIT(&bus->intr_q.head); |
