diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:21 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:21 -0800 |
| commit | 1c2fa548bf731ba1a076decbf1c494221a906baf (patch) | |
| tree | f3f4048246ce941f3906001cf018f45c421d5f9f | |
| parent | Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next (diff) | |
| parent | ASoC: wm0010: Fix possible out-of-bounds array read (diff) | |
| download | wireguard-linux-1c2fa548bf731ba1a076decbf1c494221a906baf.tar.xz wireguard-linux-1c2fa548bf731ba1a076decbf1c494221a906baf.zip | |
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/codecs/wm0010.c | 8 |
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, 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; |