From bfc60bffc40fc98f3f2d49318fe5ad6144d90a3f Mon Sep 17 00:00:00 2001
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Mon, 4 Jan 2010 16:29:49 +0100
Subject: [PATCH] --- yaml --- r: 178767 b: refs/heads/master c:
 ecbec242961ec66e900b5649ded1e40f5d5edc41 h: refs/heads/master i:   178765:
 768bd6cea201f725d264f9560e834f5db710f1d6   178763:
 75b23eab5a67b31433dd5f55e198af59d1b4efc3   178759:
 b88536f7439c27b5bf8077ad096587b0a2b53172   178751:
 e335c7e4007ec9373a2e032209960a355e0070ac v: v3

---
 [refs]                        | 2 +-
 trunk/sound/soc/codecs/ac97.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 75f9bdb70430..4b2a5eca4cdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f50548abb5454bd82c25aae15f0a3bf6a530f46
+refs/heads/master: ecbec242961ec66e900b5649ded1e40f5d5edc41
diff --git a/trunk/sound/soc/codecs/ac97.c b/trunk/sound/soc/codecs/ac97.c
index 69bd0acc81c8..a1bbe16b7f96 100644
--- a/trunk/sound/soc/codecs/ac97.c
+++ b/trunk/sound/soc/codecs/ac97.c
@@ -102,6 +102,12 @@ static int ac97_soc_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&codec->dapm_widgets);
 	INIT_LIST_HEAD(&codec->dapm_paths);
 
+	ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
+	if (ret < 0) {
+		printk(KERN_ERR "ASoC: failed to init gen ac97 glue\n");
+		goto err;
+	}
+
 	/* register pcms */
 	ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
 	if (ret < 0)