diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-11 12:20:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-11 14:20:51 +0200 |
| commit | 9c699e0a9566cfb6245284ce4857d7a06b02f3b1 (patch) | |
| tree | 6784703c6b0525c9562fd68d94a110c115e82b01 | |
| parent | ASoC: wm8996: Move reset before the initial regulator disable (diff) | |
| download | linux-9c699e0a9566cfb6245284ce4857d7a06b02f3b1.tar.xz linux-9c699e0a9566cfb6245284ce4857d7a06b02f3b1.zip | |
ASoC: wm8996: Mark the CODEC as cache only when powering off on boot
Otherwise we might try to write to a powered off device.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/wm8996.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 64d9cf7149de..dc9b42b7fc4d 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2837,8 +2837,6 @@ static int wm8996_probe(struct snd_soc_codec *codec) } } - regcache_cache_only(codec->control_data, true); - /* Apply platform data settings */ snd_soc_update_bits(codec, WM8996_LINE_INPUT_CONTROL, WM8996_INL_MODE_MASK | WM8996_INR_MODE_MASK, @@ -3211,6 +3209,7 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, goto err_regmap; } + regcache_cache_only(wm8996->regmap, true); regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies), wm8996->supplies); wm8996_init_gpio(wm8996); |