diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-10-21 14:05:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-10-21 14:05:26 +0200 |
| commit | c8d2dcb3e94106395811ac86681a4439c560cbca (patch) | |
| tree | 8bcb8096565bef5a8470e7acb1979673bc8c8c68 /sound/soc/stm/stm32_sai_sub.c | |
| parent | ALSA: hda/realtek - Add support for ALC711 (diff) | |
| parent | ASoC: SOF: control: return true when kcontrol values change (diff) | |
| download | linux-dev-c8d2dcb3e94106395811ac86681a4439c560cbca.tar.xz linux-dev-c8d2dcb3e94106395811ac86681a4439c560cbca.zip | |
Merge tag 'asoc-fix-v5.4-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.4
A collection of fixes that have arrived since the merge window. There
are a small number of core fixes here but they are smaller ones around
error handling.
Diffstat (limited to 'sound/soc/stm/stm32_sai_sub.c')
| -rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index d7501f88aaa6..a4060813bc74 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -505,10 +505,20 @@ static int stm32_sai_set_sysclk(struct snd_soc_dai *cpu_dai, if (dir == SND_SOC_CLOCK_OUT && sai->sai_mclk) { ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_NODIV, - (unsigned int)~SAI_XCR1_NODIV); + freq ? 0 : SAI_XCR1_NODIV); if (ret < 0) return ret; + /* Assume shutdown if requested frequency is 0Hz */ + if (!freq) { + /* Release mclk rate only if rate was actually set */ + if (sai->mclk_rate) { + clk_rate_exclusive_put(sai->sai_mclk); + sai->mclk_rate = 0; + } + return 0; + } + /* If master clock is used, set parent clock now */ ret = stm32_sai_set_parent_clock(sai, freq); if (ret) @@ -1093,15 +1103,6 @@ static void stm32_sai_shutdown(struct snd_pcm_substream *substream, regmap_update_bits(sai->regmap, STM_SAI_IMR_REGX, SAI_XIMR_MASK, 0); - regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_NODIV, - SAI_XCR1_NODIV); - - /* Release mclk rate only if rate was actually set */ - if (sai->mclk_rate) { - clk_rate_exclusive_put(sai->sai_mclk); - sai->mclk_rate = 0; - } - clk_disable_unprepare(sai->sai_ck); spin_lock_irqsave(&sai->irq_lock, flags); |