diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-27 10:43:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-27 10:43:40 +0200 |
| commit | bb14eb0da72afb69be261b28ec858cbd5a35e089 (patch) | |
| tree | fa72a87d21e506c990b63657d782936311cfa7cf /sound/soc/codecs/wm8961.c | |
| parent | 9430148d800dd929ad73da4c6afb67f793f8af43 (diff) | |
| parent | 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8961.c')
| -rw-r--r-- | sound/soc/codecs/wm8961.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index cdee8103d09..9568c8a49f9 100644 --- a/sound/soc/codecs/wm8961.c +++ b/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) |