d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFp4 //depot/projects/usb@159700

Browse Source 
Get rid of the last CALLOUT_RETURNUNLOCKED reference.

Submitted by:	Hans Petter Selasky
This commit is contained in:
thompsa 2009-04-05 18:18:47 +00:00
parent e287ad4395
commit c1fafa98d7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/usb/controller/usb_controller.c
View File

@ -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);