Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus

broonie · broonie · commit 125e7f1f02a6 · 2015-02-05T19:34:46.000Z
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
@@ -1046,7 +1046,7 @@ static int aic3x_prepare(struct snd_pcm_substream *substream,
 		delay += aic3x->tdm_delay;
 
 	/* Configure data delay */
-	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, aic3x->tdm_delay);
+	snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, delay);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1046,7 +1046,7 @@ static int aic3x_prepare(struct snd_pcm_substream *substream,`
`1046`	`1046`	`delay += aic3x->tdm_delay;`
`1047`	`1047`
`1048`	`1048`	`/* Configure data delay */`
`1049`		`- snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, aic3x->tdm_delay);`
	`1049`	`+ snd_soc_write(codec, AIC3X_ASD_INTF_CTRLC, delay);`
`1050`	`1050`
`1051`	`1051`	`return 0;`
`1052`	`1052`	`}`