aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2016-11-13 15:06:16 -0500
committerMark Brown <broonie@kernel.org>2016-11-14 06:23:17 -0500
commit134340b33f2ddf4869519d728ad0ca4bc67154f3 (patch)
treecb12a7060f7942c8ea97e375fcadd1dc25d0a006
parent1001354ca34179f3db924eb66672442a173147dc (diff)
ASoC: rt5616: Don't use rtd->codec
rtd->codec does not necessarily point to the CODEC instance for which the callback was called (e.g. for CODEC<->CODEC or multi-CODEC links). Use dai->codec instead. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/rt5616.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c
index d1f273b24991..7d6e0823f98f 100644
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -960,8 +960,7 @@ static int rt5616_hw_params(struct snd_pcm_substream *substream,
960 struct snd_pcm_hw_params *params, 960 struct snd_pcm_hw_params *params,
961 struct snd_soc_dai *dai) 961 struct snd_soc_dai *dai)
962{ 962{
963 struct snd_soc_pcm_runtime *rtd = substream->private_data; 963 struct snd_soc_codec *codec = dai->codec;
964 struct snd_soc_codec *codec = rtd->codec;
965 struct rt5616_priv *rt5616 = snd_soc_codec_get_drvdata(codec); 964 struct rt5616_priv *rt5616 = snd_soc_codec_get_drvdata(codec);
966 unsigned int val_len = 0, val_clk, mask_clk; 965 unsigned int val_len = 0, val_clk, mask_clk;
967 int pre_div, bclk_ms, frame_size; 966 int pre_div, bclk_ms, frame_size;