diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:42 +0000 |
| commit | cab648a436e9173cc34e13f913c7c127d1f09110 (patch) | |
| tree | cd016c4fc7957ce338d7bddb9228dbc97c973742 /sound/soc/codecs/wm8997.c | |
| parent | d66fa86956149a211db3d7ae9e9f2536b65ccde4 (diff) | |
| parent | 56fe48976db38ed3984e0e68b71e503e8179dd89 (diff) | |
| download | linux-cab648a436e9173cc34e13f913c7c127d1f09110.tar.bz2 | |
Merge tag 'asoc-v3.15-2' into asoc-next
ASoC: Updates for v3.15
This is mostly a few additional fixes from Lars-Peter, a new driver and
cleaning up a git failure with merging the Intel branch (combined with
an xargs failure to pay attention to error codes). The history lists a
bunch of additional commits for the branch but the content of those
commits is actually present already but not recorded in history due to
git failing. Unfortunately xargs is used in the merge script and it
doesn't do a good job of noticing errors from the commands it invokes.
# gpg: Signature made Thu 13 Mar 2014 14:25:44 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/wm8997.c')
| -rw-r--r-- | sound/soc/codecs/wm8997.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index e10f44d7fdb7..004186b6bd48 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1053,9 +1053,7 @@ static int wm8997_codec_probe(struct snd_soc_codec *codec) struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec); int ret; - codec->control_data = priv->core.arizona->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 32, 16, SND_SOC_REGMAP); + ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap); if (ret != 0) return ret; |