From 7ad16eb6fe6023441fca8611a51650fd33ca2ace Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 15 Aug 2012 12:32:00 +0200
Subject: [PATCH] --- yaml --- r: 321911 b: refs/heads/master c:
 e9ba389c5ffc4dd29dfe17e00e48877302111135 h: refs/heads/master i:   321909:
 68ed2890fda2f57c265f9d2d1be73307545451c0   321907:
 6ede74ac1a8f2f2ad447e5ce81ba9697ea2d1bfd   321903:
 a82e56a3dc48e50d7af8646d6d6b7d5bd88af580 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/usb/endpoint.c | 4 ----
 trunk/sound/usb/pcm.c      | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fb2932e2a0ef..dc42719b1bb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bdcff70b6cd049e6f4437b955850f5db83653cc
+refs/heads/master: e9ba389c5ffc4dd29dfe17e00e48877302111135
diff --git a/trunk/sound/usb/endpoint.c b/trunk/sound/usb/endpoint.c
index 0f647d22cb4a..c41181202688 100644
--- a/trunk/sound/usb/endpoint.c
+++ b/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;
diff --git a/trunk/sound/usb/pcm.c b/trunk/sound/usb/pcm.c
index a1298f379428..62ec808ed792 100644
--- a/trunk/sound/usb/pcm.c
+++ b/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)