diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-03-13 21:24:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-18 12:47:49 +0000 |
| commit | ab64246cf8c31f70a390dcabd134097c3aec45ab (patch) | |
| tree | 5b339a01f4a9e50b3547c3fd64dd66c3680d2127 /sound/soc/codecs/rt5640.c | |
| parent | dac7e40404a6b1e7442c01ef4c2e7e149b9627e5 (diff) | |
| download | linux-ab64246cf8c31f70a390dcabd134097c3aec45ab.tar.gz linux-ab64246cf8c31f70a390dcabd134097c3aec45ab.tar.xz | |
ASoC: codecs: Replace instances of rtd->codec with dai->codec
With CODEC to CODEC links rtd->codec does not necessarily point to the driver's
CODEC. CODEC drivers should always use dai->codec and never even look at the PCM
runtime.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/rt5640.c')
| -rw-r--r-- | sound/soc/codecs/rt5640.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index a3fb41179636..7877a5e14c54 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1601,8 +1601,7 @@ static int get_clk_info(int sclk, int rate) static int rt5640_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 rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); unsigned int val_len = 0, val_clk, mask_clk; int dai_sel, pre_div, bclk_ms, frame_size; |