From 8e6e7827e41754332068957489408a78e37095db Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 14 Oct 2011 09:39:14 +0800 Subject: [PATCH] --- yaml --- r: 270871 b: refs/heads/master c: 370f464533c455864f2f5ce100eee361263e144f h: refs/heads/master i: 270869: be6b2176287ac8e63494f0c14b50ce3c979fbc91 270867: 70fc167f40dd8e749e34057fabf6a9af4f2b0e34 270863: 895c7558f6da0917c08d04fe8274e164ef57bf2d v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8961.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f6c8167b2f8..7689bf8b3640 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38c436aa9f7dc23ebe9e8f7ae88c586acc033d30 +refs/heads/master: 370f464533c455864f2f5ce100eee361263e144f diff --git a/trunk/sound/soc/codecs/wm8961.c b/trunk/sound/soc/codecs/wm8961.c index cdee8103d09b..9568c8a49f96 100644 --- a/trunk/sound/soc/codecs/wm8961.c +++ b/trunk/sound/soc/codecs/wm8961.c @@ -974,7 +974,9 @@ static int wm8961_probe(struct snd_soc_codec *codec) } /* This isn't volatile - readback doesn't correspond to write */ - reg = codec->hw_read(codec, WM8961_RIGHT_INPUT_VOLUME); + codec->cache_bypass = 1; + reg = snd_soc_read(codec, WM8961_RIGHT_INPUT_VOLUME); + codec->cache_bypass = 0; dev_info(codec->dev, "WM8961 family %d revision %c\n", (reg & WM8961_DEVICE_ID_MASK) >> WM8961_DEVICE_ID_SHIFT, ((reg & WM8961_CHIP_REV_MASK) >> WM8961_CHIP_REV_SHIFT)