diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-28 10:41:35 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-28 10:41:35 -0400 |
commit | d63aaee1fe1ff6a946c241b214c63038883e5a79 (patch) | |
tree | 4ea20c430329aa99dcd53c237b8e131989a1d69b | |
parent | c6859959fc71c201435b61243f21948cbf83ba77 (diff) | |
parent | 2c071ed7c3660992951abe4b560359058ce41f68 (diff) |
Merge remote-tracking branch 'asoc/fix/compress' into asoc-linus
-rw-r--r-- | sound/soc/soc-compress.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 3853f7eb3f28..06a8000aa07b 100644 --- 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, | |||
220 | goto err; | 220 | goto err; |
221 | } | 221 | } |
222 | 222 | ||
223 | snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, | 223 | if (cstream->direction == SND_COMPRESS_PLAYBACK) |
224 | SND_SOC_DAPM_STREAM_START); | 224 | snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, |
225 | SND_SOC_DAPM_STREAM_START); | ||
226 | else | ||
227 | snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE, | ||
228 | SND_SOC_DAPM_STREAM_START); | ||
225 | 229 | ||
226 | /* cancel any delayed stream shutdown that is pending */ | 230 | /* cancel any delayed stream shutdown that is pending */ |
227 | rtd->pop_wait = 0; | 231 | rtd->pop_wait = 0; |