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

MFp4 //depot/projects/usb; 157069, 157255

Browse Source 
- Change "usb2_pause_mtx" so that it takes the timeout value in ticks
 - Make sure that attach waits for the generic probe to leave room for firware
   loader drivers and device specific USB Audio drivers like USB phone adapters

Submitted by:	Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2009-02-09 22:11:02 +00:00
parent d102bcfd1b
commit 3630903af2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/usb2/sound/uaudio2.c
View File

@ -539,9 +539,12 @@ uaudio_probe(device_t dev)
{
struct usb2_attach_arg *uaa = device_get_ivars(dev);
if (uaa->usb2_mode != USB_MODE_HOST) {
if (uaa->usb2_mode != USB_MODE_HOST)
return (ENXIO);
}
if (uaa->use_generic == 0)
return (ENXIO);
/* trigger on the control interface */
if ((uaa->info.bInterfaceClass == UICLASS_AUDIO) &&
@ -725,9 +728,7 @@ repeat:
if (error) {
device_printf(dev, "Waiting for sound application to exit!\n");
mtx_lock(&Giant);
usb2_pause_mtx(&Giant, 2000);
mtx_unlock(&Giant);
usb2_pause_mtx(NULL, 2 * hz);
goto repeat; /* try again */
}
return (0); /* success */