diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
commit | 4b57895522b150966eebcf18f929e1c522d90bb9 (patch) | |
tree | 0852de7700b4d6dfeb091ad190c0599e32b6df46 /sound/soc/codecs/wm5102.c | |
parent | 2914b7004b932a7ddee97c026ebafd16ab841320 (diff) | |
parent | cc76e7def0fa27b5f42aea54e34c96b4bddaf30a (diff) | |
download | linux-4b57895522b150966eebcf18f929e1c522d90bb9.tar.bz2 |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
-rw-r--r-- | sound/soc/codecs/wm5102.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index d476221dba51..b1537046e9fd 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1827,6 +1827,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = { static int wm5102_codec_probe(struct snd_soc_codec *codec) { + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec); int ret; @@ -1837,9 +1838,9 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) arizona_init_spk(codec); arizona_init_gpio(codec); - snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); + snd_soc_dapm_disable_pin(dapm, "HAPTICS"); - priv->core.arizona->dapm = &codec->dapm; + priv->core.arizona->dapm = dapm; return 0; } |