ASoC: AIC23: Fixing infinite loop in resume path
authorAnuj Aggarwal <anuj.aggarwal@ti.com>
Fri, 27 Nov 2009 12:10:58 +0000 (17:40 +0530)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 27 Nov 2009 16:45:42 +0000 (16:45 +0000)
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>
sound/soc/codecs/tlv320aic23.c

index 6b24d8bb02bb0915d415de444270608ae48d62c0..90a0264f75389f49e4c9ed544787ba0375f00c7f 100644 (file)
@@ -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);
        }