summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 15:06:52 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 15:06:52 +0400
commitfa10a92b4746caa90bdd930755774ce9607290bc (patch)
treed2fdf9efce0865fd85b8acbbfe755da0ef2a96c5 /sound
parent3dfa480b9ea7d292216cecbf976a8d36a9d1ba6e (diff)
parent1edbd35667c5a7f7cf9140b2009027ac9546e8fd (diff)
downloadlinux-fa10a92b4746caa90bdd930755774ce9607290bc.tar.xz
Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8804.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index d321a875b029..1704b1e119cb 100644
--- 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));