OSDN Git Service

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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jul 2017 22:06:04 +0000 (15:06 -0700)
commit 01b8cedfd0422326caae308641dcadaa85e0ca72 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/soc-compress.c

index bb82bb9..c1addf4 100644 (file)
@@ -68,7 +68,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_dpcm *dpcm;
        struct snd_soc_dapm_widget_list *list;
@@ -412,7 +413,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;
        int ret = 0, stream;