diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-24 09:24:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-24 09:24:39 +0100 |
| commit | 89c8ae73459443eabfd7f24b4379ddb9248f1ee9 (patch) | |
| tree | e13e7c3a780668da718161305f2d1741c0b7ae6f /sound/soc/codecs/mc13783.c | |
| parent | 2df6742f613840a0b0a1590fb28f7af5b058a673 (diff) | |
| parent | e090d5b6ad20056ec0ef58727e3ae95fd82be090 (diff) | |
| download | talos-obmc-linux-89c8ae73459443eabfd7f24b4379ddb9248f1ee9.tar.gz talos-obmc-linux-89c8ae73459443eabfd7f24b4379ddb9248f1ee9.zip | |
Merge tag 'asoc-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.15
A few more updates for the merge window:
- Fixes for the simple-card DAI format DT mess.
- A new driver for Cirrus cs42xx8 devices.
- DT support for a couple more devices.
- A revert of a previous buggy fix for soc-pcm, plus a few more fixes
and cleanups.
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; |
