summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-04 01:04:21 -0500
committerMark Brown <broonie@linaro.org>2013-11-04 01:04:21 -0500
commit1c2fa548bf731ba1a076decbf1c494221a906baf (patch)
treef3f4048246ce941f3906001cf018f45c421d5f9f
parentd09223279370bf97a15d0bfd875632da19bd5ef3 (diff)
parentc36c89096cb9f95fbdb0a6f3d80d4b9a50537ed3 (diff)
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
-rw-r--r--sound/soc/codecs/wm0010.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index d5ebcb00019b..bf7804a12863 100644
--- 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,
793 wm0010->max_spi_freq = 0; 793 wm0010->max_spi_freq = 0;
794 } else { 794 } else {
795 for (i = 0; i < ARRAY_SIZE(pll_clock_map); i++) 795 for (i = 0; i < ARRAY_SIZE(pll_clock_map); i++)
796 if (freq >= pll_clock_map[i].max_sysclk) 796 if (freq >= pll_clock_map[i].max_sysclk) {
797 wm0010->max_spi_freq = pll_clock_map[i].max_pll_spi_speed;
798 wm0010->pll_clkctrl1 = pll_clock_map[i].pll_clkctrl1;
797 break; 799 break;
798 800 }
799 wm0010->max_spi_freq = pll_clock_map[i].max_pll_spi_speed;
800 wm0010->pll_clkctrl1 = pll_clock_map[i].pll_clkctrl1;
801 } 801 }
802 802
803 return 0; 803 return 0;