Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into for-3.3

Mark Brown
2 parents 00c651612e c45471eac2
Showing 1 changed file Side-by-side Diff
sound/soc/mid-x86/sst_platform.c
@@ -267,6 +267,7 @@
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct sst_runtime_stream *stream;
+	int ret_val;
  
 	pr_debug("sst_platform_open called\n");
...	...	@@ -267,6 +267,7 @@
267	267	{
268	268	struct snd_pcm_runtime *runtime = substream->runtime;
269	269	struct sst_runtime_stream *stream;
	270	+ int ret_val;
270	271
271	272	pr_debug("sst_platform_open called\n");
272	273