Merge branch 'for-linus' into for-next

2012-11-08 15:58:25 +01:00
parent c9adeefda0 8bb4d9ce08
commit 17a4adbe68
21 changed files with 98 additions and 41 deletions
@@ -565,6 +565,9 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
 		goto unlock;
 	}

+	snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint);
+	snd_usb_endpoint_sync_pending_stop(subs->data_endpoint);
+
 	ret = set_format(subs, subs->cur_audiofmt);
 	if (ret < 0)
 		goto unlock;