Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
6413d542b0
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user