Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270810
b: refs/heads/master
c: 9bf311f
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed Oct 10, 2011
1 parent 717a3b7 commit 7b22cd5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 960622da0d0583637e5d2de85b4202cbfc0981c6
refs/heads/master: 9bf311fe17f16effaf264af76cb3aaaf384556b3
15 changes: 2 additions & 13 deletions trunk/sound/soc/codecs/wm8731.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
int i, ret;
u8 data[2];
u16 *cache = codec->reg_cache;
int ret;
u16 reg;

switch (level) {
Expand All @@ -444,16 +442,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
if (ret != 0)
return ret;

/* Sync reg_cache with the hardware */
for (i = 0; i < ARRAY_SIZE(wm8731_reg); i++) {
if (cache[i] == wm8731_reg[i])
continue;

data[0] = (i << 1) | ((cache[i] >> 8)
& 0x0001);
data[1] = cache[i] & 0x00ff;
codec->hw_write(codec->control_data, data, 2);
}
snd_soc_cache_sync(codec);
}

/* Clear PWROFF, gate CLKOUT, everything else as-is */
Expand Down

0 comments on commit 7b22cd5

Please sign in to comment.