diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 18:00:47 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 18:00:47 +0400 |
| commit | f928badf5e58195af2ae3a457da35190d10ace48 (patch) | |
| tree | b3cf42e3aa815464a4b2da0508c6b12f246768b0 /sound/soc/codecs/mc13783.c | |
| parent | 9780b68435eea68906bcf8f34c5522b5b087f4be (diff) | |
| parent | ab64246cf8c31f70a390dcabd134097c3aec45ab (diff) | |
| download | linux-f928badf5e58195af2ae3a457da35190d10ace48.tar.xz | |
Merge remote-tracking branch 'asoc/topic/codecs' into asoc-next
Diffstat (limited to 'sound/soc/codecs/mc13783.c')
| -rw-r--r-- | sound/soc/codecs/mc13783.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 37d737e567a1..2c59b1fb69dc 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -106,8 +106,7 @@ static int mc13783_pcm_hw_params_dac(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; unsigned int rate = params_rate(params); int i; @@ -126,8 +125,7 @@ static int mc13783_pcm_hw_params_codec(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; unsigned int rate = params_rate(params); unsigned int val; |