summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-20 16:20:38 +0100
committerMark Brown <broonie@linaro.org>2013-11-20 16:20:38 +0100
commit9a5c543dd71952719d40429b6ef252a46c9b2246 (patch)
treed77013224cc84527439b3c096362d5e086f26d21 /sound/soc
parentMerge remote-tracking branch 'asoc/fix/rcar' into asoc-linus (diff)
parentASoC: wm8962: Turn on regcache_cache_only before disabling regulator (diff)
downloadlinux-9a5c543dd71952719d40429b6ef252a46c9b2246.tar.xz
linux-9a5c543dd71952719d40429b6ef252a46c9b2246.zip
Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 3a2f96c5442c..48dce72fed1d 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3728,6 +3728,8 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
if (ret < 0)
goto err_enable;
+ regcache_cache_only(wm8962->regmap, true);
+
/* The drivers should power up as needed */
regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);