From 2f5751f74b9dcb11227094272ad54d1014b704d2 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 11 Jan 2013 22:59:35 +0000 Subject: [PATCH] --- yaml --- r: 353346 b: refs/heads/master c: e5ddd303215d1e5e89d06056d17673b18219ace3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm5102.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 966ee47d085d..21c0d77d4f7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4706ccbbe89c0c1871134f493de8b27864b869ba +refs/heads/master: e5ddd303215d1e5e89d06056d17673b18219ace3 diff --git a/trunk/sound/soc/codecs/wm5102.c b/trunk/sound/soc/codecs/wm5102.c index 2adcfbae4d22..5e85b645f2eb 100644 --- a/trunk/sound/soc/codecs/wm5102.c +++ b/trunk/sound/soc/codecs/wm5102.c @@ -1579,6 +1579,10 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) if (ret != 0) return ret; + ret = snd_soc_add_codec_controls(codec, wm_adsp_fw_controls, 1); + if (ret != 0) + return ret; + snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); priv->core.arizona->dapm = &codec->dapm;