diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-29 09:31:06 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-29 09:31:06 -0500 |
| commit | 660c63a4a289a835aa9af93a45884c5d0c004b20 (patch) | |
| tree | 46f6ecc2a506002ef937fab16a9cfad845036e37 /sound/soc/codecs | |
| parent | 640b796f2ca88113bf2fefd380bc807092ce6fa1 (diff) | |
| parent | 5bbd4953a4fb5d8d597b4a53b8da97eee320b634 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index a9dc5fb54774..da589d8664d0 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
| @@ -627,7 +627,7 @@ static int tlv320aic23_resume(struct platform_device *pdev) | |||
| 627 | u16 reg; | 627 | u16 reg; |
| 628 | 628 | ||
| 629 | /* Sync reg_cache with the hardware */ | 629 | /* Sync reg_cache with the hardware */ |
| 630 | for (reg = 0; reg < TLV320AIC23_RESET; reg++) { | 630 | for (reg = 0; reg <= TLV320AIC23_ACTIVE; reg++) { |
| 631 | u16 val = tlv320aic23_read_reg_cache(codec, reg); | 631 | u16 val = tlv320aic23_read_reg_cache(codec, reg); |
| 632 | tlv320aic23_write(codec, reg, val); | 632 | tlv320aic23_write(codec, reg, val); |
| 633 | } | 633 | } |