]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
ASoC: wm8996: Mark the CODEC as cache only when powering off on boot
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Jun 2012 10:20:02 +0000 (18:20 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Jun 2012 12:20:51 +0000 (20:20 +0800)
Otherwise we might try to write to a powered off device.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8996.c

index 64d9cf7149de9df23ebc9b2a7bab8fbd65d62cf6..dc9b42b7fc4d79d749f07be41f1fe3484eb987e5 100644 (file)
@@ -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);