aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/tlv320aic23.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-27 11:56:22 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-27 11:56:22 -0500
commit5c5452f703cd9660c4f2549458d9fd0008e1a100 (patch)
treee8500f15c182cba122cb30bd2bd93b31689a19eb /sound/soc/codecs/tlv320aic23.c
parent49af574b60669a58a2e96960ac694ce953119083 (diff)
parente9ff5eb2ae018fe2298c68746c873bf828c6b10e (diff)
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs/tlv320aic23.c')
-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 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)
624{ 624{
625 struct snd_soc_device *socdev = platform_get_drvdata(pdev); 625 struct snd_soc_device *socdev = platform_get_drvdata(pdev);
626 struct snd_soc_codec *codec = socdev->card->codec; 626 struct snd_soc_codec *codec = socdev->card->codec;
627 int i;
628 u16 reg; 627 u16 reg;
629 628
630 /* Sync reg_cache with the hardware */ 629 /* Sync reg_cache with the hardware */
631 for (reg = 0; reg < ARRAY_SIZE(tlv320aic23_reg); i++) { 630 for (reg = 0; reg < TLV320AIC23_RESET; reg++) {
632 u16 val = tlv320aic23_read_reg_cache(codec, reg); 631 u16 val = tlv320aic23_read_reg_cache(codec, reg);
633 tlv320aic23_write(codec, reg, val); 632 tlv320aic23_write(codec, reg, val);
634 } 633 }