From c121b2022872465dfd7cefe81bf6d32516aca02f Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 24 Oct 2011 11:32:41 +0800 Subject: [PATCH] --- yaml --- r: 283658 b: refs/heads/master c: 49fa4d9b5aeafb985abe8cb8cdf6432690c49ad3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8940.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b87b53e136e3..b33de511c1c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 753ddf52153b60be924109df3bebab0cd60b3297 +refs/heads/master: 49fa4d9b5aeafb985abe8cb8cdf6432690c49ad3 diff --git a/trunk/sound/soc/codecs/wm8940.c b/trunk/sound/soc/codecs/wm8940.c index a4abfdfb217b..3cc3bce61316 100644 --- a/trunk/sound/soc/codecs/wm8940.c +++ b/trunk/sound/soc/codecs/wm8940.c @@ -627,8 +627,8 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai, ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 5)); break; case WM8940_OPCLKDIV: - reg = snd_soc_read(codec, WM8940_ADDCNTRL) & 0xFFCF; - ret = snd_soc_write(codec, WM8940_ADDCNTRL, reg | (div << 4)); + reg = snd_soc_read(codec, WM8940_GPIO) & 0xFFCF; + ret = snd_soc_write(codec, WM8940_GPIO, reg | (div << 4)); break; } return ret;