ASoC: compress: Derive substream from stream based on direction
authorSatish Babu Patakokila <sbpata@codeaurora.org>
Sat, 17 Jun 2017 00:33:40 +0000 (17:33 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 19 Jun 2017 16:11:25 +0000 (17:11 +0100)
Currently compress driver hardcodes direction as playback to get
substream from the stream. This results in getting the incorrect
substream for compressed capture usecase.
To fix this, remove the hardcoding and derive substream based on
the stream direction.

Signed-off-by: Satish Babu Patakokila <sbpata@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
sound/soc/soc-compress.c

index bfd71b873ca27ea981720cb5f747ddc34ef51438..206f36bf43e8b8720db54a8b463305561979a20d 100644 (file)
@@ -81,7 +81,8 @@ out:
 static int soc_compr_open_fe(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *fe = cstream->private_data;
-       struct snd_pcm_substream *fe_substream = fe->pcm->streams[0].substream;
+       struct snd_pcm_substream *fe_substream =
+                fe->pcm->streams[cstream->direction].substream;
        struct snd_soc_platform *platform = fe->platform;
        struct snd_soc_dai *cpu_dai = fe->cpu_dai;
        struct snd_soc_dpcm *dpcm;
@@ -467,7 +468,8 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
                                        struct snd_compr_params *params)
 {
        struct snd_soc_pcm_runtime *fe = cstream->private_data;
-       struct snd_pcm_substream *fe_substream = fe->pcm->streams[0].substream;
+       struct snd_pcm_substream *fe_substream =
+                fe->pcm->streams[cstream->direction].substream;
        struct snd_soc_platform *platform = fe->platform;
        struct snd_soc_dai *cpu_dai = fe->cpu_dai;
        int ret = 0, stream;