summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2014-11-24 20:37:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-16 06:59:46 -0800
commitc50176d6435734b5433256b7c84c9b99d5fc98be (patch)
tree6ada2b881e5175f08cddc584cc502022161b982e /sound
parent877fd33fb30bb40235d0b4ed0b6106c5d7faf5cf (diff)
downloadlwn-c50176d6435734b5433256b7c84c9b99d5fc98be.tar.gz
lwn-c50176d6435734b5433256b7c84c9b99d5fc98be.zip
ASoC: tlv320aic31xx: Fix off by one error in the loop stucture.
commit bbc686b34650b0f54affe9d9a637ccbe02b03760 upstream. Fix off by one read beyond the end of a table. Reported-by: David Binderman <dcb314@hotmail.com> Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/tlv320aic31xx.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 145fe5b253d4..93de5dd0a7b9 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -911,12 +911,13 @@ static int aic31xx_set_dai_sysclk(struct snd_soc_dai *codec_dai,
}
aic31xx->p_div = i;
- for (i = 0; aic31xx_divs[i].mclk_p != freq/aic31xx->p_div; i++) {
- if (i == ARRAY_SIZE(aic31xx_divs)) {
- dev_err(aic31xx->dev, "%s: Unsupported frequency %d\n",
- __func__, freq);
- return -EINVAL;
- }
+ for (i = 0; i < ARRAY_SIZE(aic31xx_divs) &&
+ aic31xx_divs[i].mclk_p != freq/aic31xx->p_div; i++)
+ ;
+ if (i == ARRAY_SIZE(aic31xx_divs)) {
+ dev_err(aic31xx->dev, "%s: Unsupported frequency %d\n",
+ __func__, freq);
+ return -EINVAL;
}
/* set clock on MCLK, BCLK, or GPIO1 as PLL input */