diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-12-29 15:14:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-12-29 15:14:07 +0100 |
| commit | 3abf66a42f1ff0f5ae5de3943ce1551ceedf81a0 (patch) | |
| tree | 45efce6311378bbd33378cdf2d5689ac4166cc73 /sound/soc/soc-pcm.c | |
| parent | 126c18a4bb6460c3d82b57c56941104ed34b7ba6 (diff) | |
| parent | 423206604b28174698d77bf5ea81365cdd6c0f77 (diff) | |
| download | linux-3abf66a42f1ff0f5ae5de3943ce1551ceedf81a0.tar.gz linux-3abf66a42f1ff0f5ae5de3943ce1551ceedf81a0.tar.bz2 linux-3abf66a42f1ff0f5ae5de3943ce1551ceedf81a0.zip | |
Merge branch 'topic/cs35l41' into for-next
Pull CS35L41 codec extension series.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 9d688917cce2..6c0d949c60c7 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -712,11 +712,6 @@ static int soc_pcm_clean(struct snd_soc_pcm_runtime *rtd, if (snd_soc_dai_active(dai) == 0 && (dai->rate || dai->channels || dai->sample_bits)) soc_pcm_set_dai_params(dai, NULL); - - if (snd_soc_dai_stream_active(dai, substream->stream) == 0) { - if (dai->driver->ops && !dai->driver->ops->mute_unmute_on_trigger) - snd_soc_dai_digital_mute(dai, 1, substream->stream); - } } } @@ -955,8 +950,10 @@ static int soc_pcm_hw_clean(struct snd_soc_pcm_runtime *rtd, if (snd_soc_dai_active(dai) == 1) soc_pcm_set_dai_params(dai, NULL); - if (snd_soc_dai_stream_active(dai, substream->stream) == 1) - snd_soc_dai_digital_mute(dai, 1, substream->stream); + if (snd_soc_dai_stream_active(dai, substream->stream) == 1) { + if (dai->driver->ops && !dai->driver->ops->mute_unmute_on_trigger) + snd_soc_dai_digital_mute(dai, 1, substream->stream); + } } /* run the stream event */ |