Skip to content

Commit

Permalink
Merge branch 'for-3.2' into for-3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Nov 21, 2011
2 parents cb55531 + ed3e80c commit 6413d54
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions sound/soc/codecs/wm8731.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6413d54

Please sign in to comment.