diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 10:00:47 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 10:00:47 -0400 |
| commit | f928badf5e58195af2ae3a457da35190d10ace48 (patch) | |
| tree | b3cf42e3aa815464a4b2da0508c6b12f246768b0 /sound/soc/codecs/mc13783.c | |
| parent | 9780b68435eea68906bcf8f34c5522b5b087f4be (diff) | |
| parent | ab64246cf8c31f70a390dcabd134097c3aec45ab (diff) | |
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, | |||
| 106 | struct snd_pcm_hw_params *params, | 106 | struct snd_pcm_hw_params *params, |
| 107 | struct snd_soc_dai *dai) | 107 | struct snd_soc_dai *dai) |
| 108 | { | 108 | { |
| 109 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 109 | struct snd_soc_codec *codec = dai->codec; |
| 110 | struct snd_soc_codec *codec = rtd->codec; | ||
| 111 | unsigned int rate = params_rate(params); | 110 | unsigned int rate = params_rate(params); |
| 112 | int i; | 111 | int i; |
| 113 | 112 | ||
| @@ -126,8 +125,7 @@ static int mc13783_pcm_hw_params_codec(struct snd_pcm_substream *substream, | |||
| 126 | struct snd_pcm_hw_params *params, | 125 | struct snd_pcm_hw_params *params, |
| 127 | struct snd_soc_dai *dai) | 126 | struct snd_soc_dai *dai) |
| 128 | { | 127 | { |
| 129 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 128 | struct snd_soc_codec *codec = dai->codec; |
| 130 | struct snd_soc_codec *codec = rtd->codec; | ||
| 131 | unsigned int rate = params_rate(params); | 129 | unsigned int rate = params_rate(params); |
| 132 | unsigned int val; | 130 | unsigned int val; |
| 133 | 131 | ||