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

MFp4: //depot/projects/usb@155754

Browse Source 
Make sure that the cancelled error code
	is always checked and result in a return
	from the USB callback.

Submitted by: Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2009-01-13 19:01:46 +00:00
parent 204793b247
commit a767337039
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2921,6 +2921,8 @@ uaudio_mixer_write_cfg_callback(struct usb2_xfer *xfer)
uint8_t chan;
uint8_t buf[2];
DPRINTF("\n");
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
tr_transferred:
@ -2980,11 +2982,14 @@ uaudio_mixer_write_cfg_callback(struct usb2_xfer *xfer)
if (repeat) {
goto tr_setup;
}
return;
break;
default: /* Error */
DPRINTF("error=%s\n", usb2_errstr(xfer->error));
if (xfer->error == USB_ERR_CANCELLED) {
/* do nothing - we are detaching */
break;
}
goto tr_transferred;
}
}