diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-19 13:17:19 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-19 13:17:19 +0300 |
| commit | 89a6192049050035cbd779d35686cbf29ca9184f (patch) | |
| tree | f63c3344dc7ce4da5589d043d6135c7ff81508fd /sound/soc/codecs/wm5102.c | |
| parent | f9f55e31f8a537b7eaccc4fdb243cff938fa428c (diff) | |
| parent | cc76e7def0fa27b5f42aea54e34c96b4bddaf30a (diff) | |
| download | linux-89a6192049050035cbd779d35686cbf29ca9184f.tar.xz | |
Merge branches 'topic/adsp' and 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-arizona
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 872c2ad88fb7..2f9c88f9fc8f 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1872,6 +1872,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; @@ -1882,9 +1883,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; } |