diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-27 17:56:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-27 17:56:22 +0100 |
| commit | 5c5452f703cd9660c4f2549458d9fd0008e1a100 (patch) | |
| tree | e8500f15c182cba122cb30bd2bd93b31689a19eb /sound/soc | |
| parent | ALSA: ARM: add Raumfeld audio support (diff) | |
| parent | ASoC: AIC23: Fixing infinite loop in resume path (diff) | |
| download | linux-5c5452f703cd9660c4f2549458d9fd0008e1a100.tar.xz linux-5c5452f703cd9660c4f2549458d9fd0008e1a100.zip | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index a091ce778108..09d1af85b6f1 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -624,11 +624,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); } |