1 files changed, 23 insertions, 26 deletions

diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index ab3782657ac8..18f2babe1090 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -371,13 +371,13 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = {
         SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put),
         SOC_ENUM("EQ1 Cutoff", eq1_cutoff),
         SOC_SINGLE_TLV("EQ1 Volume", WM8985_EQ1_LOW_SHELF,  0, 24, 1, eq_tlv),
-        SOC_ENUM("EQ2 Bandwith", eq2_bw),
+        SOC_ENUM("EQ2 Bandwidth", eq2_bw),
         SOC_ENUM("EQ2 Cutoff", eq2_cutoff),
         SOC_SINGLE_TLV("EQ2 Volume", WM8985_EQ2_PEAK_1, 0, 24, 1, eq_tlv),
-        SOC_ENUM("EQ3 Bandwith", eq3_bw),
+        SOC_ENUM("EQ3 Bandwidth", eq3_bw),
         SOC_ENUM("EQ3 Cutoff", eq3_cutoff),
         SOC_SINGLE_TLV("EQ3 Volume", WM8985_EQ3_PEAK_2, 0, 24, 1, eq_tlv),
-        SOC_ENUM("EQ4 Bandwith", eq4_bw),
+        SOC_ENUM("EQ4 Bandwidth", eq4_bw),
         SOC_ENUM("EQ4 Cutoff", eq4_cutoff),
         SOC_SINGLE_TLV("EQ4 Volume", WM8985_EQ4_PEAK_3, 0, 24, 1, eq_tlv),
         SOC_ENUM("EQ5 Cutoff", eq5_cutoff),
@@ -830,33 +830,30 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id,
         struct pll_div pll_div;
 
         codec = dai->codec;
-        if (freq_in && freq_out) {
+        if (!freq_in || !freq_out) {
+                /* disable the PLL */
+                snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
+                                    WM8985_PLLEN_MASK, 0);
+        } else {
                 ret = pll_factors(&pll_div, freq_out * 4 * 2, freq_in);
                 if (ret)
                         return ret;
-        }
 
-        /* disable the PLL before reprogramming it */
-        snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
-                            WM8985_PLLEN_MASK, 0);
-        
-        if (!freq_in || !freq_out)
-                return 0;
-
-        /* set PLLN and PRESCALE */
-        snd_soc_write(codec, WM8985_PLL_N,
-                      (pll_div.div2 << WM8985_PLL_PRESCALE_SHIFT)
-                      | pll_div.n);
-        /* set PLLK */
-        snd_soc_write(codec, WM8985_PLL_K_3, pll_div.k & 0x1ff);
-        snd_soc_write(codec, WM8985_PLL_K_2, (pll_div.k >> 9) & 0x1ff);
-        snd_soc_write(codec, WM8985_PLL_K_1, (pll_div.k >> 18));
-        /* set the source of the clock to be the PLL */
-        snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL,
-                            WM8985_CLKSEL_MASK, WM8985_CLKSEL);
-        /* enable the PLL */
-        snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
-                            WM8985_PLLEN_MASK, WM8985_PLLEN);
+                /* set PLLN and PRESCALE */
+                snd_soc_write(codec, WM8985_PLL_N,
+                              (pll_div.div2 << WM8985_PLL_PRESCALE_SHIFT)
+                              | pll_div.n);
+                /* set PLLK */
+                snd_soc_write(codec, WM8985_PLL_K_3, pll_div.k & 0x1ff);
+                snd_soc_write(codec, WM8985_PLL_K_2, (pll_div.k >> 9) & 0x1ff);
+                snd_soc_write(codec, WM8985_PLL_K_1, (pll_div.k >> 18));
+                /* set the source of the clock to be the PLL */
+                snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL,
+                                    WM8985_CLKSEL_MASK, WM8985_CLKSEL);
+                /* enable the PLL */
+                snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
+                                    WM8985_PLLEN_MASK, WM8985_PLLEN);
+        }
         return 0;
 }