From 98b8185d0c0a8802d30f23fbc6ea04197ba1f6b5 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 17 Apr 2009 18:04:41 +0200
Subject: [PATCH] --- yaml --- r: 143723 b: refs/heads/master c:
 93e82ae781e1ca4797cf2a226d3c303975bd99c7 h: refs/heads/master i:   143721:
 ae279420e870e5023231c1ea08ebaa4919239018   143719:
 cfda2d40b08f18ff49b82339b5f8d2340240bbda v: v3

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

diff --git a/[refs] b/[refs]
index 09bed7dd6eb9..26e35baab583 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dc1f87f079d5c6b01284d08b28eff2c4fbd15c4
+refs/heads/master: 93e82ae781e1ca4797cf2a226d3c303975bd99c7
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index fd6e6f337d10..8820faf6c9d8 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -642,19 +642,21 @@ static int get_codec_name(struct hda_codec *codec)
  */
 static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec)
 {
-	int i, total_nodes;
+	int i, total_nodes, function_id;
 	hda_nid_t nid;
 
 	total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &nid);
 	for (i = 0; i < total_nodes; i++, nid++) {
-		codec->function_id = snd_hda_param_read(codec, nid,
+		function_id = snd_hda_param_read(codec, nid,
 						AC_PAR_FUNCTION_TYPE) & 0xff;
-		switch (codec->function_id) {
+		switch (function_id) {
 		case AC_GRP_AUDIO_FUNCTION:
 			codec->afg = nid;
+			codec->function_id = function_id;
 			break;
 		case AC_GRP_MODEM_FUNCTION:
 			codec->mfg = nid;
+			codec->function_id = function_id;
 			break;
 		default:
 			break;