summaryrefslogtreecommitdiff
path: root/sound/soc/stm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-12-01 17:15:12 +0300
committerMark Brown <broonie@kernel.org>2021-12-01 17:15:12 +0300
commit67140b64b68395b79177efcd16a7530ed5311e49 (patch)
treeb1843f4e04d9c0f1d749add23f78ed2ddc84e7ed /sound/soc/stm
parentf316c9d9ba8ea08d6994bc5ba8fa276eab186208 (diff)
parent046aede2f847676f93a2ea4f48b77909c51dba40 (diff)
downloadlinux-67140b64b68395b79177efcd16a7530ed5311e49.tar.xz
Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.17 so we can apply new Tegra work
Diffstat (limited to 'sound/soc/stm')
-rw-r--r--sound/soc/stm/stm32_i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
index 68c5de040df8..24327cabd32a 100644
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@ -701,7 +701,7 @@ static int stm32_i2s_configure_clock(struct snd_soc_dai *cpu_dai,
if (ret < 0)
return ret;
- nb_bits = frame_len * ((cgfr & I2S_CGFR_CHLEN) + 1);
+ nb_bits = frame_len * (FIELD_GET(I2S_CGFR_CHLEN, cgfr) + 1);
ret = stm32_i2s_calc_clk_div(i2s, i2s_clock_rate,
(nb_bits * rate));
if (ret)