diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
commit | 1a618c2cfe4c02190d8d1f9c5052f0defc58de20 (patch) | |
tree | 170002288786f702e1d4ca638b53d1594a7caa16 /sound/soc/codecs/wm8962.c | |
parent | Merge tag 'perf-core-for-mingo-20160429' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs (diff) | |
download | linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.tar.xz linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
-rw-r--r-- | sound/soc/codecs/wm8962.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 88223608a33f..720a14e0687d 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2471,7 +2471,7 @@ static void wm8962_configure_bclk(struct snd_soc_codec *codec) break; default: dev_warn(codec->dev, "Unknown DSPCLK divisor read back\n"); - dspclk = wm8962->sysclk; + dspclk = wm8962->sysclk_rate; } dev_dbg(codec->dev, "DSPCLK is %dHz, BCLK %d\n", dspclk, wm8962->bclk); |