Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c5452f7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.32' into for-2.6.33

parents 49af574b e9ff5eb2

sound/soc/codecs/tlv320aic23.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}