From dd6b39bceb475b41e10b3bbdd2bfe459b24d4e1b Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pascal@unilogicnetworks.net>
Date: Mon, 23 Mar 2009 11:15:59 +0100
Subject: [PATCH] --- yaml --- r: 133133 b: refs/heads/master c:
 234b4346a064f8a2a488da10b3c1e640fb778a17 h: refs/heads/master i:   133131:
 44f4e1bfca6a2f5d2a5108f4b14f9cd6e6c21afc v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 6 +++---
 trunk/sound/pci/hda/hda_codec.h | 1 +
 trunk/sound/pci/hda/hda_proc.c  | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 05a33043df4a..6c0243658083 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9840cf4cf12a4ec4fe3c4db3c28f638d06e942b
+refs/heads/master: 234b4346a064f8a2a488da10b3c1e640fb778a17
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index b90a2400f53d..1b5575ecb0a4 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -647,9 +647,9 @@ static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec)
 
 	total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
 	for (i = 0; i < total_nodes; i++, nid++) {
-		unsigned int func;
-		func = snd_hda_param_read(codec, nid, AC_PAR_FUNCTION_TYPE);
-		switch (func & 0xff) {
+		codec->function_id = snd_hda_param_read(codec, nid,
+						AC_PAR_FUNCTION_TYPE) & 0xff;
+		switch (codec->function_id) {
 		case AC_GRP_AUDIO_FUNCTION:
 			codec->afg = nid;
 			break;
diff --git a/trunk/sound/pci/hda/hda_codec.h b/trunk/sound/pci/hda/hda_codec.h
index 079e1ab718d4..2fdecf4b0eb6 100644
--- a/trunk/sound/pci/hda/hda_codec.h
+++ b/trunk/sound/pci/hda/hda_codec.h
@@ -739,6 +739,7 @@ struct hda_codec {
 	hda_nid_t mfg;	/* MFG node id */
 
 	/* ids */
+	u32 function_id;
 	u32 vendor_id;
 	u32 subsystem_id;
 	u32 revision_id;
diff --git a/trunk/sound/pci/hda/hda_proc.c b/trunk/sound/pci/hda/hda_proc.c
index 639cf0edaa98..93d7499350c6 100644
--- a/trunk/sound/pci/hda/hda_proc.c
+++ b/trunk/sound/pci/hda/hda_proc.c
@@ -469,8 +469,9 @@ static void print_codec_info(struct snd_info_entry *entry,
 	snd_iprintf(buffer, "Codec: %s\n",
 		    codec->name ? codec->name : "Not Set");
 	snd_iprintf(buffer, "Address: %d\n", codec->addr);
-	snd_iprintf(buffer, "Vendor Id: 0x%x\n", codec->vendor_id);
-	snd_iprintf(buffer, "Subsystem Id: 0x%x\n", codec->subsystem_id);
+	snd_iprintf(buffer, "Function Id: 0x%x\n", codec->function_id);
+	snd_iprintf(buffer, "Vendor Id: 0x%08x\n", codec->vendor_id);
+	snd_iprintf(buffer, "Subsystem Id: 0x%08x\n", codec->subsystem_id);
 	snd_iprintf(buffer, "Revision Id: 0x%x\n", codec->revision_id);
 
 	if (codec->mfg)