diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-05 19:34:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-05 19:34:46 +0000 |
| commit | 125e7f1f02a610411d097b44f0058f8c6415301e (patch) | |
| tree | 17e2377c8f4b94812d8772b0aff98c8e5da5b3c1 /sound | |
| parent | 4b871df52edd89811ff122060ab783e9de740664 (diff) | |
| parent | 0b65ba9981d8fe80fd099f26dd96c60e07729aeb (diff) | |
| download | op-kernel-dev-125e7f1f02a610411d097b44f0058f8c6415301e.zip op-kernel-dev-125e7f1f02a610411d097b44f0058f8c6415301e.tar.gz | |
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
Diffstat (limited to 'sound')
| -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 b7ebce0..dd222b1 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, 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; } |
