diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-05-15 07:41:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-15 11:53:07 -0400 |
| commit | 8c44b2b1aee1a0e1d47af9ed96ebb848dbcdea50 (patch) | |
| tree | 1af481cd0c46db46a55eb1fcf82c44d860aa4a63 | |
| parent | 49fee17816347c401be0dfcf98ee9fc131f25f10 (diff) | |
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>
| -rw-r--r-- | sound/soc/intel/sst-baytrail-pcm.c | 2 |
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) | |||
| 254 | 254 | ||
| 255 | snd_soc_set_runtime_hwparams(substream, &sst_byt_pcm_hardware); | 255 | snd_soc_set_runtime_hwparams(substream, &sst_byt_pcm_hardware); |
| 256 | 256 | ||
| 257 | pcm_data->stream = sst_byt_stream_new(byt, rtd->cpu_dai->id + 1, | 257 | pcm_data->stream = sst_byt_stream_new(byt, substream->stream + 1, |
| 258 | byt_notify_pointer, pcm_data); | 258 | byt_notify_pointer, pcm_data); |
| 259 | if (pcm_data->stream == NULL) { | 259 | if (pcm_data->stream == NULL) { |
| 260 | dev_err(rtd->dev, "failed to create stream\n"); | 260 | dev_err(rtd->dev, "failed to create stream\n"); |
