Merge remote-tracking branch 'asoc/fix/compress' into asoc-linus

d63aaee1 · Mark Brown · c6859959 · 2c071ed7 · d63aaee1
Commit d63aaee1 authored May 28, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

sound/soc/soc-compress.c sound/soc/soc-compress.c +6 -2

No files found.
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -220,8 +220,12 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
 			goto err;
 	}

-	snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
-				SND_SOC_DAPM_STREAM_START);
+	if (cstream->direction == SND_COMPRESS_PLAYBACK)
+		snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
+					SND_SOC_DAPM_STREAM_START);
+	else
+		snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE,
+					SND_SOC_DAPM_STREAM_START);

 	/* cancel any delayed stream shutdown that is pending */
 	rtd->pop_wait = 0;