From 7f6e81dbad5dedcfb5c536a27ad34b080df677e5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 27 Nov 2006 12:05:04 +0100 Subject: [PATCH] --- yaml --- r: 47131 b: refs/heads/master c: 2e26e483694059d63bda7bb89d5a464c952d1d44 h: refs/heads/master i: 47129: e3a3e485173a0868b777233778784c32f5efcc8b 47127: 75defc2d5e4fb74a650bec24d598864f4c4f7293 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8bedecacd60..92e2b93c7e6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5fcc13c2fc62da6f75d80189a51c2492afb39c0 +refs/heads/master: 2e26e483694059d63bda7bb89d5a464c952d1d44 diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 6da1616bf776..90e8841e7e33 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/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