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

125e7f1f · Mark Brown · 4b871df5 · 0b65ba99 · 125e7f1f
Commit 125e7f1f authored Feb 05, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/tlv320aic3x.c sound/soc/codecs/tlv320aic3x.c +1 -1

No files found.
--- 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;
 }