diff options
author | Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
commit | 3146089d235b304e665dc551472ae9cb9ab58572 (patch) | |
tree | d1a9141c302f269cb8468f0d4de78124ea5e389a /sound/soc/stm/stm32_sai_sub.c | |
parent | b5e806ae4ad81de66c334d3d333fa42f960fbbd1 (diff) | |
parent | 7b6b0049e2b70d103adf1b7d0320802f70ddceca (diff) |
Merge branch 'asoc-5.1' into asoc-next
Diffstat (limited to 'sound/soc/stm/stm32_sai_sub.c')
-rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index d4825700b63f..f9297228c41c 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -898,7 +898,7 @@ static int stm32_sai_configure_clock(struct snd_soc_dai *cpu_dai, struct snd_pcm_hw_params *params) { struct stm32_sai_sub_data *sai = snd_soc_dai_get_drvdata(cpu_dai); - int cr1, mask, div = 0; + int div = 0; int sai_clk_rate, mclk_ratio, den; unsigned int rate = params_rate(params); @@ -943,10 +943,8 @@ static int stm32_sai_configure_clock(struct snd_soc_dai *cpu_dai, } else { if (sai->mclk_rate) { mclk_ratio = sai->mclk_rate / rate; - if (mclk_ratio == 512) { - mask = SAI_XCR1_OSR; - cr1 = SAI_XCR1_OSR; - } else if (mclk_ratio != 256) { + if ((mclk_ratio != 512) && + (mclk_ratio != 256)) { dev_err(cpu_dai->dev, "Wrong mclk ratio %d\n", mclk_ratio); |