From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 14 Oct 2011 01:37:00 +0000 (+0800)
Subject: ASoC: tlv320aic3x: Convert codec->hw_read to snd_soc_read
X-Git-Tag: Ubuntu-5.0.0-8.9~16892^2~464
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=38c436aa9f7dc23ebe9e8f7ae88c586acc033d30;p=mirror_ubuntu-disco-kernel.git

ASoC: tlv320aic3x: 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>
---

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index be55b7f36282..7a49390bc30d 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -137,7 +137,10 @@ static int aic3x_read(struct snd_soc_codec *codec, unsigned int reg,
 	if (reg >= AIC3X_CACHEREGNUM)
 		return -1;
 
-	*value = codec->hw_read(codec, reg);
+	codec->cache_bypass = 1;
+	*value = snd_soc_read(codec, reg);
+	codec->cache_bypass = 0;
+
 	cache[reg] = *value;
 
 	return 0;