Commit ab574d16 authored by Takashi Iwai's avatar Takashi Iwai

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.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b94a62a6
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment