diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 11:43:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 11:43:41 +0100 |
| commit | a941145d2b3510242453242b88bb4e69b0a298e3 (patch) | |
| tree | e2068a3e56fec25f0c0a75890673c0af94271ceb /sound | |
| parent | Merge remote-tracking branch 'asoc/topic/warn' into asoc-next (diff) | |
| parent | ASoC: wm0010: Fix possible out-of-bounds array read (diff) | |
| download | linux-a941145d2b3510242453242b88bb4e69b0a298e3.tar.xz linux-a941145d2b3510242453242b88bb4e69b0a298e3.zip | |
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
Diffstat (limited to 'sound')
| -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 aea916431227..71ce3159a62e 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -794,11 +794,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; |