diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-26 01:22:02 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-26 01:22:02 +0400 |
| commit | 8efe588b0f5c8d4400aee27cc7b5213715a7443b (patch) | |
| tree | 7a842bbfa88e14727f3be645126c6dc8617124f7 /sound/soc/codecs/isabelle.c | |
| parent | acae02c475146a69a6a48c7c8a162c39d5a6521b (diff) | |
| parent | e090d5b6ad20056ec0ef58727e3ae95fd82be090 (diff) | |
| download | linux-8efe588b0f5c8d4400aee27cc7b5213715a7443b.tar.xz | |
Merge tag 'asoc-v3.15-3' into asoc-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.
# gpg: Signature made Sun 23 Mar 2014 16:56:11 GMT using RSA key ID 7EA229BD
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg: aka "Mark Brown <broonie@debian.org>"
# gpg: aka "Mark Brown <broonie@kernel.org>"
# gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg: aka "Mark Brown <broonie@linaro.org>"
# gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
Diffstat (limited to 'sound/soc/codecs/isabelle.c')
| -rw-r--r-- | sound/soc/codecs/isabelle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index 3e264a78017a..3a89ce66d51d 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -918,8 +918,7 @@ static int isabelle_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; u16 aif = 0; unsigned int fs_val = 0; |