@@ -350,7 +350,8 @@ static void snd_complete_urb(struct urb *urb)
urb->status == -ENODEV || /* device removed */
urb->status == -ECONNRESET || /* unlinked */
urb->status == -ESHUTDOWN || /* device disabled */
- ep->chip->shutdown)) /* device disconnected */
+ ep->chip->shutdown) || /* device disconnected */
+ !test_bit(EP_FLAG_RUNNING, &ep->flags))
goto exit_clear;
if (usb_pipeout(ep->pipe)) {
@@ -522,13 +523,13 @@ static int deactivate_urbs(struct snd_usb_endpoint *ep, int force, int can_sleep
unsigned int i;
int async;
+ clear_bit(EP_FLAG_RUNNING, &ep->flags);
+
if (!force && ep->chip->shutdown) /* to be sure... */
return -EBADFD;
async = !can_sleep && ep->chip->async_unlink;
- clear_bit(EP_FLAG_RUNNING, &ep->flags);
-
INIT_LIST_HEAD(&ep->ready_playback_urbs);
ep->next_packet_read_pos = 0;
ep->next_packet_write_pos = 0;