Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-03 12:27:49 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-03 12:27:49 -0800
commit39fcddc24caa8cda5db70ac62ae743a02551fec5 (patch)
tree5b762b8d96873ab3b94f52ec12ec3cc57b47da69
parent63fb1539735afe7c76e7ccdf1999f1fc0d7434e1 (diff)
Revert "ASoC: Don't go through cache when applying WM5100 rev A updates"
This reverts commit 78fd75340768980ce6ca646106762a6928289e0c (upstream commit 495174a8ffbaa0d15153d855cf206cdc46d51cf4) as it breaks the build. Reported-by: Tim Gardner <rtg.canonical@gmail.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/soc/codecs/wm5100.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index c745ce83fb80..42d9039a49e9 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1379,7 +1379,6 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
switch (wm5100->rev) {
case 0:
- regcache_cache_bypass(wm5100->regmap, true);
snd_soc_write(codec, 0x11, 0x3);
snd_soc_write(codec, 0x203, 0xc);
snd_soc_write(codec, 0x206, 0);
@@ -1395,7 +1394,6 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
snd_soc_write(codec,
wm5100_reva_patches[i].reg,
wm5100_reva_patches[i].val);
- regcache_cache_bypass(wm5100->regmap, false);
break;
default:
break;