diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-05 14:34:46 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-05 14:34:46 -0500 |
| commit | 125e7f1f02a610411d097b44f0058f8c6415301e (patch) | |
| tree | 17e2377c8f4b94812d8772b0aff98c8e5da5b3c1 | |
| parent | 4b871df52edd89811ff122060ab783e9de740664 (diff) | |
| parent | 0b65ba9981d8fe80fd099f26dd96c60e07729aeb (diff) | |
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index b7ebce054b4e..dd222b10ce13 100644 --- 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, | |||
| 1046 | delay += aic3x->tdm_delay; | 1046 | delay += aic3x->tdm_delay; |
| 1047 | 1047 | ||
| 1048 | /* Configure data delay */ | 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 | return 0; | 1051 | return 0; |
| 1052 | } | 1052 | } |