projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
codecs
/
wm8997.c
diff --git
a/sound/soc/codecs/wm8997.c
b/sound/soc/codecs/wm8997.c
index e10f44d7fdb78381a9c459d1d9bce5cbfa61b44d..004186b6bd48131932ac8fceca088548b9df9eb5 100644
(file)
--- 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;
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;
if (ret != 0)
return ret;