diff options
author | Mark Brown <broonie@kernel.org> | 2020-03-27 18:29:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-03-27 18:29:20 +0100 |
commit | 1c521d7e62262793789845989edca57dea24eb7d (patch) | |
tree | dd891362188494b9d665229696ffb72187998a00 /sound/soc/codecs/cs4271.c | |
parent | Merge branch 'asoc-5.6' into asoc-linus (diff) | |
parent | Merge series "ASoC: Intel: add SoundWire machine driver" from Pierre-Louis Bo... (diff) | |
download | linux-1c521d7e62262793789845989edca57dea24eb7d.tar.xz linux-1c521d7e62262793789845989edca57dea24eb7d.zip |
Merge branch 'asoc-5.7' into asoc-next
Diffstat (limited to 'sound/soc/codecs/cs4271.c')
-rw-r--r-- | sound/soc/codecs/cs4271.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 04b86a51e055..62f412d6f9f2 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -356,9 +356,9 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream, */ if ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK && - !dai->capture_active) || + !dai->stream_active[SNDRV_PCM_STREAM_CAPTURE]) || (substream->stream == SNDRV_PCM_STREAM_CAPTURE && - !dai->playback_active)) { + !dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK])) { ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, CS4271_MODE2_PDN, CS4271_MODE2_PDN); |