Ticket #2930: takashi.patch

sound/usb/endpoint.c

@@ -35 +35 @@
 
 #define EP_FLAG_ACTIVATED       0
 #define EP_FLAG_RUNNING         1
+#define EP_FLAG_STOPPING        2
 
 /*
  * snd_usb_endpoint is a model that abstracts everything related to an
@@ -502 +503 @@
         if (alive)
                 snd_printk(KERN_ERR "timeout: still %d active urbs on EP #%x\n",
                                         alive, ep->ep_num);
+        clear_bit(EP_FLAG_STOPPING, &ep->flags);
 
         return 0;
 }
 
+/* wait until urbs are really dropped */
+void snd_usb_endpoint_sync_stop(struct snd_usb_endpoint *ep)
+{
+        if (test_bit(EP_FLAG_STOPPING, &ep->flags))
+                wait_clear_urbs(ep);
+}
+
+
 /*
  * unlink active urbs.
  */
@@ -913 +923 @@
 
                 if (wait)
                         wait_clear_urbs(ep);
+                else
+                        set_bit(EP_FLAG_STOPPING, &ep->flags);
         }
 }
 

sound/usb/endpoint.h

@@ -16 +16 @@
 int  snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int can_sleep);
 void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep,
                            int force, int can_sleep, int wait);
+void snd_usb_endpoint_sync_stop(struct snd_usb_endpoint *ep);
 int  snd_usb_endpoint_activate(struct snd_usb_endpoint *ep);
 int  snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);
 void snd_usb_endpoint_free(struct list_head *head);

sound/usb/pcm.c

@@ -546 +546 @@
         if (snd_BUG_ON(!subs->data_endpoint))
                 return -EIO;
 
+        if (subs->sync_endpoint)
+                snd_usb_endpoint_sync_stop(subs->sync_endpoint);
+        if (subs->data_endpoint)
+                snd_usb_endpoint_sync_stop(subs->data_endpoint);
+
         /* some unit conversions in runtime */
         subs->data_endpoint->maxframesize =
                 bytes_to_frames(runtime, subs->data_endpoint->maxpacksize);