Merge branch 'topic/misc' into for-linus

1 files changed, 6 insertions, 4 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 05e8995f9aec..a7802b99436c 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -733,15 +733,17 @@ 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++) {
                 function_id = snd_hda_param_read(codec, nid,
-                                                AC_PAR_FUNCTION_TYPE) & 0xff;
-                switch (function_id) {
+                                                AC_PAR_FUNCTION_TYPE);
+                switch (function_id & 0xff) {
                 case AC_GRP_AUDIO_FUNCTION:
                         codec->afg = nid;
-                        codec->function_id = function_id;
+                        codec->afg_function_id = function_id & 0xff;
+                        codec->afg_unsol = (function_id >> 8) & 1;
                         break;
                 case AC_GRP_MODEM_FUNCTION:
                         codec->mfg = nid;
-                        codec->function_id = function_id;
+                        codec->mfg_function_id = function_id & 0xff;
+                        codec->mfg_unsol = (function_id >> 8) & 1;
                         break;
                 default:
                         break;