aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb2
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2009-01-13 19:01:46 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2009-01-13 19:01:46 +0000
commita76733703998233a3035b3c67dd3ece13715e178 (patch)
tree6edc62a1c9b3d561b5e790fe17aceac9dcb4acf0 /sys/dev/usb2
parent204793b247d9699a6bf974fbea5280f04cb614b8 (diff)
Notes
Diffstat (limited to 'sys/dev/usb2')
-rw-r--r--sys/dev/usb2/sound/uaudio2.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/usb2/sound/uaudio2.c b/sys/dev/usb2/sound/uaudio2.c
index 614db85d8be2..13021061036b 100644
--- a/sys/dev/usb2/sound/uaudio2.c
+++ b/sys/dev/usb2/sound/uaudio2.c
@@ -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 @@ tr_setup:
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;
}
}