iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ALSA] usb-audio: show USB error descriptions

Browse Source 
Modules: USB generic driver

When usb_submit_urb() fails, show an error description instead of just
the error code.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2006-03-09 07:58:39 +01:00 committed by Jaroslav Kysela
parent 0243ef71ac
commit 32e19e882c
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sound/usb/usbaudio.c
View File

@ -773,6 +773,31 @@ static int deactivate_urbs(struct snd_usb_substream *subs, int force, int can_sl
} }
static const char *usb_error_string(int err)
{
switch (err) {
case -ENODEV:
return "no device";
case -ENOENT:
return "endpoint not enabled";
case -EPIPE:
return "endpoint stalled";
case -ENOSPC:
return "not enough bandwidth";
case -ESHUTDOWN:
return "device disabled";
case -EHOSTUNREACH:
return "device suspended";
case -EINVAL:
case -EAGAIN:
case -EFBIG:
case -EMSGSIZE:
return "internal error";
default:
return "unknown error";
}
}
/* /*
* set up and start data/sync urbs * set up and start data/sync urbs
*/ */
@ -805,16 +830,22 @@ static int start_urbs(struct snd_usb_substream *subs, struct snd_pcm_runtime *ru
subs->unlink_mask = 0; subs->unlink_mask = 0;
subs->running = 1; subs->running = 1;
for (i = 0; i < subs->nurbs; i++) { for (i = 0; i < subs->nurbs; i++) {
if ((err = usb_submit_urb(subs->dataurb[i].urb, GFP_ATOMIC)) < 0) { err = usb_submit_urb(subs->dataurb[i].urb, GFP_ATOMIC);
snd_printk(KERN_ERR "cannot submit datapipe for urb %d, err = %d\n", i, err); if (err < 0) {
snd_printk(KERN_ERR "cannot submit datapipe "
"for urb %d, error %d: %s\n",
i, err, usb_error_string(err));
goto __error; goto __error;
} }
set_bit(i, &subs->active_mask); set_bit(i, &subs->active_mask);
} }
if (subs->syncpipe) { if (subs->syncpipe) {
for (i = 0; i < SYNC_URBS; i++) { for (i = 0; i < SYNC_URBS; i++) {
if ((err = usb_submit_urb(subs->syncurb[i].urb, GFP_ATOMIC)) < 0) { err = usb_submit_urb(subs->syncurb[i].urb, GFP_ATOMIC);
snd_printk(KERN_ERR "cannot submit syncpipe for urb %d, err = %d\n", i, err); if (err < 0) {
snd_printk(KERN_ERR "cannot submit syncpipe "
"for urb %d, error %d: %s\n",
i, err, usb_error_string(err));
goto __error; goto __error;
} }
set_bit(i + 16, &subs->active_mask); set_bit(i + 16, &subs->active_mask);