---

yaml
---
r: 321911
b: refs/heads/master
c: e9ba389
h: refs/heads/master
i:
  321909: 68ed289
  321907: 6ede74a
  321903: a82e56a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bdcff70b6cd049e6f4437b955850f5db83653cc
+refs/heads/master: e9ba389c5ffc4dd29dfe17e00e48877302111135

trunk/sound/usb/endpoint.c

@@ -821,10 +821,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep)
 	if (++ep->use_count != 1)
 		return 0;
 
-	/* just to be sure */
-	deactivate_urbs(ep, 0, 1);
-	wait_clear_urbs(ep);
-
 	ep->active_mask = 0;
 	ep->unlink_mask = 0;
 	ep->phase = 0;

trunk/sound/usb/pcm.c

@@ -544,6 +544,9 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
 	subs->last_frame_number = 0;
 	runtime->delay = 0;
 
+	/* clear the pending deactivation on the target EPs */
+	deactivate_endpoints(subs);
+
 	/* for playback, submit the URBs now; otherwise, the first hwptr_done
 	 * updates for all URBs would happen at the same time when starting */
 	if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK)