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 <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c
index 23a25c0627bdbddc7e5acd5ad7277a8dc734ad8c..6242ccce2bb79318ef8c90bd52599b8356576f2a 100644 (file)
--- 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");