Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293173
b: refs/heads/master
c: 274eb8f
h: refs/heads/master
i:
  293171: f11afca
v: v3
  • Loading branch information
Mark Brown committed Jan 20, 2012
1 parent a12bd46 commit c8875d4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 28 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: 93e26d4e44e65ef803ea35cfd0fe14fd8af49cb0
refs/heads/master: 274eb8f9d8780903ccd40e007928f26c3a8c6e15
28 changes: 1 addition & 27 deletions trunk/sound/soc/codecs/wm8904.c
Original file line number Diff line number Diff line change
Expand Up @@ -2088,32 +2088,6 @@ static int wm8904_digital_mute(struct snd_soc_dai *codec_dai, int mute)
return 0;
}

static void wm8904_sync_cache(struct snd_soc_codec *codec)
{
u16 *reg_cache = codec->reg_cache;
int i;

if (!codec->cache_sync)
return;

codec->cache_only = 0;

/* Sync back cached values if they're different from the
* hardware default.
*/
for (i = 1; i < codec->driver->reg_cache_size; i++) {
if (!wm8904_access[i].writable)
continue;

if (reg_cache[i] == wm8904_reg[i])
continue;

snd_soc_write(codec, i, reg_cache[i]);
}

codec->cache_sync = 0;
}

static int wm8904_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
Expand Down Expand Up @@ -2146,7 +2120,7 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,
return ret;
}

wm8904_sync_cache(codec);
snd_soc_cache_sync(codec);

/* Enable bias */
snd_soc_update_bits(codec, WM8904_BIAS_CONTROL_0,
Expand Down

0 comments on commit c8875d4

Please sign in to comment.