From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Date: Thu, 15 May 2014 11:41:48 +0000 (+0300)
Subject: ASoC: Intel: Fix simultaneous Baytrail SST capture and playback
X-Git-Tag: firefly_0821_release~176^2~3750^2~24^2~7^3~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c44b2b1aee1a0e1d47af9ed96ebb848dbcdea50;p=firefly-linux-kernel-4.4.55.git

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>
---

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");