diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 12:01:12 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 12:01:12 -0500 |
| commit | 6413d542b04800188fd5401d97d141880c638df6 (patch) | |
| tree | 5305c52e37058a64434ccdd71bfcc9f99b61677d /sound/soc/codecs/wm8731.c | |
| parent | cb555318ca5dd5c1426c7a639aa1e90a88c8f024 (diff) | |
| parent | ed3e80c4c991a52f9fce3421536a78e331ae0949 (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
| -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, | |||
| 453 | snd_soc_write(codec, WM8731_PWR, 0xffff); | 453 | snd_soc_write(codec, WM8731_PWR, 0xffff); |
| 454 | regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), | 454 | regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), |
| 455 | wm8731->supplies); | 455 | wm8731->supplies); |
| 456 | codec->cache_sync = 1; | ||
| 456 | break; | 457 | break; |
| 457 | } | 458 | } |
| 458 | codec->dapm.bias_level = level; | 459 | codec->dapm.bias_level = level; |