summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2006-11-27 12:05:04 +0100
committerJaroslav Kysela <perex@suse.cz>2007-02-09 09:02:07 +0100
commit2e26e483694059d63bda7bb89d5a464c952d1d44 (patch)
tree1d33fd0f08bb3b2833ee9ea73978c5b7841191c6 /sound/soc
parentf5fcc13c2fc62da6f75d80189a51c2492afb39c0 (diff)
downloadlinux-2e26e483694059d63bda7bb89d5a464c952d1d44.tar.gz
linux-2e26e483694059d63bda7bb89d5a464c952d1d44.tar.bz2
linux-2e26e483694059d63bda7bb89d5a464c952d1d44.zip
[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: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6da1616bf776..90e8841e7e33 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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