mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ALSA: usb-audio: Don't try to submit URBs after disconnection 

USB-audio driver can still submit URBs while the device is being
disconnected, and it may result in spurious error messages like:
  usb 1-2: cannot submit urb (err = -19)
  usb 1-2: Unable to submit urb #0: -19 at snd_usb_queue_pending_output_urbs
  usb 1-2: cannot submit urb 0, error -19: no device
Although those are harmless, they are just ugly.

This patch tries to avoid spewing such error messages when the device
is already at the disconnected state.  It also skips the superfluous
xfer notification, too.

Link: https://lore.kernel.org/r/20230828101924.27107-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-08-28 12:19:24 +02:00
parent b94a62a663
commit ab574d1629
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sound/usb/endpoint.c
View File

@ -505,13 +505,18 @@ int snd_usb_queue_pending_output_urbs(struct snd_usb_endpoint *ep,
return -EPIPE;
}
err = usb_submit_urb(ctx->urb, GFP_ATOMIC);
if (!atomic_read(&ep->chip->shutdown))
err = usb_submit_urb(ctx->urb, GFP_ATOMIC);
else
err = -ENODEV;
if (err < 0) {
usb_audio_err(ep->chip,
"Unable to submit urb #%d: %d at %s\n",
ctx->index, err, __func__);
if (!in_stream_lock)
notify_xrun(ep);
if (!atomic_read(&ep->chip->shutdown)) {
usb_audio_err(ep->chip,
"Unable to submit urb #%d: %d at %s\n",
ctx->index, err, __func__);
if (!in_stream_lock)
notify_xrun(ep);
}
return -EPIPE;
}
@ -575,12 +580,17 @@ static void snd_complete_urb(struct urb *urb)
prepare_inbound_urb(ep, ctx);
}
err = usb_submit_urb(urb, GFP_ATOMIC);
if (!atomic_read(&ep->chip->shutdown))
err = usb_submit_urb(urb, GFP_ATOMIC);
else
err = -ENODEV;
if (err == 0)
return;
usb_audio_err(ep->chip, "cannot submit urb (err = %d)\n", err);
notify_xrun(ep);
if (!atomic_read(&ep->chip->shutdown)) {
usb_audio_err(ep->chip, "cannot submit urb (err = %d)\n", err);
notify_xrun(ep);
}
exit_clear:
clear_bit(ctx->index, &ep->active_mask);
@ -1603,11 +1613,15 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep)
goto __error;
}
err = usb_submit_urb(urb, GFP_ATOMIC);
if (!atomic_read(&ep->chip->shutdown))
err = usb_submit_urb(urb, GFP_ATOMIC);
else
err = -ENODEV;
if (err < 0) {
usb_audio_err(ep->chip,
"cannot submit urb %d, error %d: %s\n",
i, err, usb_error_string(err));
if (!atomic_read(&ep->chip->shutdown))
usb_audio_err(ep->chip,
"cannot submit urb %d, error %d: %s\n",
i, err, usb_error_string(err));
goto __error;
}
set_bit(i, &ep->active_mask);