diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-17 15:31:54 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-17 15:31:54 +0900 |
| commit | 4706ccbbe89c0c1871134f493de8b27864b869ba (patch) | |
| tree | ad8c359e136c2f0ef908ac0c03f3a0fba4ab7a57 /sound/soc/codecs/arizona.c | |
| parent | c98137bfcb4afd4415864258dd8ecf05c2bb5843 (diff) | |
| parent | b59e0f82aa350e380142353fbd30706092ba6312 (diff) | |
| download | op-kernel-dev-4706ccbbe89c0c1871134f493de8b27864b869ba.zip op-kernel-dev-4706ccbbe89c0c1871134f493de8b27864b869ba.tar.gz | |
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
Conflicts:
sound/soc/codecs/arizona.c
Diffstat (limited to 'sound/soc/codecs/arizona.c')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index a12dd16..316f074 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -778,7 +778,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - lrclk = snd_soc_params_to_bclk(params) / params_rate(params); + lrclk = rates[bclk] / params_rate(params); arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n", rates[bclk], rates[bclk] / lrclk); |
