Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next

fa10a92b · Mark Brown · 3dfa480b · 1edbd356 · fa10a92b
Commit fa10a92b authored Feb 11, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sound/soc/codecs/wm8804.c sound/soc/codecs/wm8804.c +0 -3

No files found.
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -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));