---

yaml --- r: 353346 b: refs/heads/master c: e5ddd30 h: refs/heads/master v: v3
git-mirror · Jan 18, 2013 · 2f5751f · 2f5751f
1 parent 27cfac0
commit 2f5751f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;