summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/rt5616.c
diff options
context:
space:
mode:
authorLars-Peter Clausen2016-11-13 21:06:16 +0100
committerMark Brown2016-11-14 12:23:17 +0100
commit134340b33f2ddf4869519d728ad0ca4bc67154f3 (patch)
treecb12a7060f7942c8ea97e375fcadd1dc25d0a006 /sound/soc/codecs/rt5616.c
parentLinux 4.9-rc1 (diff)
downloadkernel-qcow2-linux-134340b33f2ddf4869519d728ad0ca4bc67154f3.tar.gz
kernel-qcow2-linux-134340b33f2ddf4869519d728ad0ca4bc67154f3.tar.xz
kernel-qcow2-linux-134340b33f2ddf4869519d728ad0ca4bc67154f3.zip
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>
Diffstat (limited to 'sound/soc/codecs/rt5616.c')
-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,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct snd_soc_codec *codec = rtd->codec;
+ struct snd_soc_codec *codec = dai->codec;
struct rt5616_priv *rt5616 = snd_soc_codec_get_drvdata(codec);
unsigned int val_len = 0, val_clk, mask_clk;
int pre_div, bclk_ms, frame_size;