diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:47 +0000 |
| commit | f928badf5e58195af2ae3a457da35190d10ace48 (patch) | |
| tree | b3cf42e3aa815464a4b2da0508c6b12f246768b0 /sound/soc/codecs/rt5640.c | |
| parent | 9780b68435eea68906bcf8f34c5522b5b087f4be (diff) | |
| parent | ab64246cf8c31f70a390dcabd134097c3aec45ab (diff) | |
| download | op-kernel-dev-f928badf5e58195af2ae3a457da35190d10ace48.zip op-kernel-dev-f928badf5e58195af2ae3a457da35190d10ace48.tar.gz | |
Merge remote-tracking branch 'asoc/topic/codecs' into asoc-next
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 13ccee4..0061ae6 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1594,8 +1594,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; |
