Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Feb 11, 2013
2 parents 3dfa480 + 1edbd35 commit fa10a92
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions sound/soc/codecs/wm8804.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,6 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
/* power down the PLL before reprogramming it */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);

if (!freq_in || !freq_out)
return 0;

/* set PLLN and PRESCALE */
snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10,
pll_div.n | (pll_div.prescale << 4));
Expand Down

0 comments on commit fa10a92

Please sign in to comment.