diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 18:01:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 18:01:12 +0100 |
| commit | 6413d542b04800188fd5401d97d141880c638df6 (patch) | |
| tree | 5305c52e37058a64434ccdd71bfcc9f99b61677d | |
| parent | ASoC: Use table based init for wm8731_snd_controls (diff) | |
| parent | ASoC: Ensure WM8731 register cache is synced when resuming from disabled (diff) | |
| download | linux-6413d542b04800188fd5401d97d141880c638df6.tar.xz linux-6413d542b04800188fd5401d97d141880c638df6.zip | |
Merge branch 'for-3.2' into for-3.3
| -rw-r--r-- | sound/soc/codecs/wm8731.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index f5161f383fc4..ca59622e41d2 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -453,6 +453,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, snd_soc_write(codec, WM8731_PWR, 0xffff); regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); + codec->cache_sync = 1; break; } codec->dapm.bias_level = level; |