diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-21 09:41:12 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-21 09:41:12 +0400 |
| commit | 858940773ad5f9dfe32ddb34fa1c90638c5a39df (patch) | |
| tree | 5f1ee58fd98d798dcbedb98507f2a1cf5ee7a9b2 /sound/pci/hda/hda_codec.c | |
| parent | 7670dc41b51983b369f9adfb8694a580e7b0cef2 (diff) | |
| parent | 622e84cdff719b9dcd3f495ddb0afb54995799cc (diff) | |
| download | linux-858940773ad5f9dfe32ddb34fa1c90638c5a39df.tar.xz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 48f0cea7df14..66a7d3de9fa0 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -643,19 +643,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; |