diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-10-13 21:39:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-14 15:29:04 -0400 |
| commit | 370f464533c455864f2f5ce100eee361263e144f (patch) | |
| tree | c0ea807ad7f9121c8ee10d4eec2610d0c6419efa /sound | |
| parent | 38c436aa9f7dc23ebe9e8f7ae88c586acc033d30 (diff) | |
ASoC: wm8961: Convert codec->hw_read to snd_soc_read
codec->hw_read is broken now, let's covert to snd_soc_read.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -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 cdee8103d09b..9568c8a49f96 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) | |||
| 974 | } | 974 | } |
| 975 | 975 | ||
| 976 | /* This isn't volatile - readback doesn't correspond to write */ | 976 | /* This isn't volatile - readback doesn't correspond to write */ |
| 977 | reg = codec->hw_read(codec, WM8961_RIGHT_INPUT_VOLUME); | 977 | codec->cache_bypass = 1; |
| 978 | reg = snd_soc_read(codec, WM8961_RIGHT_INPUT_VOLUME); | ||
| 979 | codec->cache_bypass = 0; | ||
| 978 | dev_info(codec->dev, "WM8961 family %d revision %c\n", | 980 | dev_info(codec->dev, "WM8961 family %d revision %c\n", |
| 979 | (reg & WM8961_DEVICE_ID_MASK) >> WM8961_DEVICE_ID_SHIFT, | 981 | (reg & WM8961_DEVICE_ID_MASK) >> WM8961_DEVICE_ID_SHIFT, |
| 980 | ((reg & WM8961_CHIP_REV_MASK) >> WM8961_CHIP_REV_SHIFT) | 982 | ((reg & WM8961_CHIP_REV_MASK) >> WM8961_CHIP_REV_SHIFT) |