summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAnuj Aggarwal <anuj.aggarwal@ti.com>2009-11-27 17:40:58 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-27 16:45:42 +0000
commite9ff5eb2ae018fe2298c68746c873bf828c6b10e (patch)
tree2604814b3f1f35e935c39a4762ea1630c3df902a /sound/soc
parent50b6bce59d154b5db137907a5c0ed45a4e7a3829 (diff)
downloadlinux-e9ff5eb2ae018fe2298c68746c873bf828c6b10e.tar.bz2
ASoC: AIC23: Fixing infinite loop in resume path
This patch fixes two issues: a) Infinite loop in resume function b) Writes to non-existing registers in resume function Cc: stable@kernel.org Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/tlv320aic23.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index 6b24d8bb02bb..90a0264f7538 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -625,11 +625,10 @@ static int tlv320aic23_resume(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec;
- int i;
u16 reg;
/* Sync reg_cache with the hardware */
- for (reg = 0; reg < ARRAY_SIZE(tlv320aic23_reg); i++) {
+ for (reg = 0; reg < TLV320AIC23_RESET; reg++) {
u16 val = tlv320aic23_read_reg_cache(codec, reg);
tlv320aic23_write(codec, reg, val);
}