summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 15:41:35 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 15:41:35 +0100
commitd63aaee1fe1ff6a946c241b214c63038883e5a79 (patch)
tree4ea20c430329aa99dcd53c237b8e131989a1d69b /sound
parentc6859959fc71c201435b61243f21948cbf83ba77 (diff)
parent2c071ed7c3660992951abe4b560359058ce41f68 (diff)
downloadlinux-3.10-d63aaee1fe1ff6a946c241b214c63038883e5a79.tar.gz
linux-3.10-d63aaee1fe1ff6a946c241b214c63038883e5a79.tar.bz2
linux-3.10-d63aaee1fe1ff6a946c241b214c63038883e5a79.zip
Merge remote-tracking branch 'asoc/fix/compress' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-compress.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 3853f7eb3f2..06a8000aa07 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,
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;