---

yaml --- r: 322663 b: refs/heads/master c: 1213a20 h: refs/heads/master i: 322661: 970bd71 322659: 005a09c 322655: 0351e48 v: v3
git-mirror · Sep 6, 2012 · b91e100 · b91e100
1 parent 8fa14c6
commit b91e100
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab548d2dba63ba947287965e525cc02a15d9853d
+refs/heads/master: 1213a205f9ed27d97de3d5bed28fb085ef4853e2
diff --git a/trunk/sound/usb/pcm.c b/trunk/sound/usb/pcm.c
@@ -1140,6 +1140,12 @@ static void retire_playback_urb(struct snd_usb_substream *subs,
 	int processed = urb->transfer_buffer_length / stride;
 	int est_delay;
 
+	/* ignore the delay accounting when procssed=0 is given, i.e.
+	 * silent payloads are procssed before handling the actual data
+	 */
+	if (!processed)
+		return;
+
 	spin_lock_irqsave(&subs->lock, flags);
 	est_delay = snd_usb_pcm_delay(subs, runtime->rate);
 	/* update delay with exact number of samples played */