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

Mark Brown
2 parents 4b871df52e 0b65ba9981
Showing 1 changed file Side-by-side Diff
sound/soc/codecs/tlv320aic3x.c
@@ -1046,7 +1046,7 @@
 		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;
 }
...	...	@@ -1046,7 +1046,7 @@
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	}