Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e26e483 authored by Philipp Zabel's avatar Philipp Zabel Committed by Jaroslav Kysela
Browse files

[ALSA] ASoC - Bit clock matching error 



This patch by Philipp Zabel fixes a bug whereby the BCLK matching fails
when the Codec BCLK is constant and the CPU BCLK is based upon a
divider.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent f5fcc13c

sound/soc/soc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static int soc_hw_match_params(struct snd_pcm_substream *substream, 
				/* normalise cpu bfs div & codec const mult */

				codec_bfs = soc_bfs_rate_to_div(codec_dai_mode->bfs, rate,

					mclk, rtd->codec_dai->dai_runtime.pcmfmt, chn);

				if(codec_dai_mode->bfs & codec_bfs) {

				if(cpu_dai_mode->bfs & codec_bfs) {

					rtd->cpu_dai->dai_runtime.bfs = codec_bfs;

					rtd->codec_dai->dai_runtime.bfs = codec_dai_mode->bfs;

				} else