Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 216603
b: refs/heads/master
c: 6c20c80
h: refs/heads/master
i:
  216601: b5f568e
  216599: 32ae103
v: v3
  • Loading branch information
Dimitris Papastamos authored and Mark Brown committed Oct 4, 2010
1 parent 970b0be commit 1cb7302
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 86ce6c9a62c333157d3f2ef4e4dc1fe18b70eb63
refs/heads/master: 6c20c807cf5a13f61193d39bb718f7a9b5df3813
6 changes: 3 additions & 3 deletions trunk/sound/soc/codecs/wm8804.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
codec = dai->codec;
if (!freq_in || !freq_out) {
/* disable the PLL */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0);
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);
return 0;
} else {
int ret;
Expand All @@ -406,7 +406,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
return ret;

/* power down the PLL before reprogramming it */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0);
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);

if (!freq_in || !freq_out)
return 0;
Expand All @@ -423,7 +423,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16);

/* power up the PLL */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0);
}

return 0;
Expand Down

0 comments on commit 1cb7302

Please sign in to comment.