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

1c2fa548 · Mark Brown · d0922327 · c36c8909 · 1c2fa548
Commit 1c2fa548 authored Nov 03, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sound/soc/codecs/wm0010.c sound/soc/codecs/wm0010.c +4 -4

No files found.
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -793,11 +793,11 @@ static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source,
 		wm0010->max_spi_freq = 0;
 	} else {
 		for (i = 0; i < ARRAY_SIZE(pll_clock_map); i++)
-			if (freq >= pll_clock_map[i].max_sysclk)
+			if (freq >= pll_clock_map[i].max_sysclk) {
+				wm0010->max_spi_freq = pll_clock_map[i].max_pll_spi_speed;
+				wm0010->pll_clkctrl1 = pll_clock_map[i].pll_clkctrl1;
 				break;
+			}
-		wm0010->max_spi_freq = pll_clock_map[i].max_pll_spi_speed;
-		wm0010->pll_clkctrl1 = pll_clock_map[i].pll_clkctrl1;
 	}
 	return 0;