summaryrefslogtreecommitdiff
path: root/sound/soc/intel
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2014-05-15 14:41:48 +0300
committerMark Brown <broonie@linaro.org>2014-05-15 16:53:07 +0100
commit8c44b2b1aee1a0e1d47af9ed96ebb848dbcdea50 (patch)
tree1af481cd0c46db46a55eb1fcf82c44d860aa4a63 /sound/soc/intel
parent49fee17816347c401be0dfcf98ee9fc131f25f10 (diff)
downloadlinux-next-8c44b2b1aee1a0e1d47af9ed96ebb848dbcdea50.tar.gz
ASoC: Intel: Fix simultaneous Baytrail SST capture and playback
I managed to drop a change to stream ID setting from commit 49fee1781634 ("ASoC: Intel: Only export one Baytrail DAI") leading to non-working simultaneous capture-playback since after one DAI conversion rtd->cpu_dai->id + 1 will be the same for both playback and capture. Use substream->stream + 1 like it was in original Liam's patch. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel')
-rw-r--r--sound/soc/intel/sst-baytrail-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c
index 23a25c0627bd..6242ccce2bb7 100644
--- a/sound/soc/intel/sst-baytrail-pcm.c
+++ b/sound/soc/intel/sst-baytrail-pcm.c
@@ -254,7 +254,7 @@ static int sst_byt_pcm_open(struct snd_pcm_substream *substream)
snd_soc_set_runtime_hwparams(substream, &sst_byt_pcm_hardware);
- pcm_data->stream = sst_byt_stream_new(byt, rtd->cpu_dai->id + 1,
+ pcm_data->stream = sst_byt_stream_new(byt, substream->stream + 1,
byt_notify_pointer, pcm_data);
if (pcm_data->stream == NULL) {
dev_err(rtd->dev, "failed to create stream\n");