1 files changed, 4 insertions, 8 deletions

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index a2cdf3370afe..15d1d5c63c3c 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -384,9 +384,6 @@ static void snd_complete_urb(struct urb *urb)
         if (unlikely(atomic_read(&ep->chip->shutdown)))
                 goto exit_clear;
 
-        if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))
-                goto exit_clear;
-
         if (usb_pipeout(ep->pipe)) {
                 retire_outbound_urb(ep, ctx);
                 /* can be stopped during retire callback */
@@ -537,11 +534,6 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep)
                         alive, ep->ep_num);
         clear_bit(EP_FLAG_STOPPING, &ep->flags);
 
-        ep->data_subs = NULL;
-        ep->sync_slave = NULL;
-        ep->retire_data_urb = NULL;
-        ep->prepare_data_urb = NULL;
-
         return 0;
 }
 
@@ -1028,6 +1020,10 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep)
 
         if (--ep->use_count == 0) {
                 deactivate_urbs(ep, false);
+                ep->data_subs = NULL;
+                ep->sync_slave = NULL;
+                ep->retire_data_urb = NULL;
+                ep->prepare_data_urb = NULL;
                 set_bit(EP_FLAG_STOPPING, &ep->flags);
         }
 }