ALSA: hda-intel - do not mix audio and modem function IDs

The function IDs are different for audio and modem. Do not mix them.
Also, show the unsolicited bit in the function_id register.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index a3d638c8c1fd96a407c64b36ee2098d60e087bea..6e0de65f1f3aea6a6cd3f6d8b3c4b7de43900fb0 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -730,15 +730,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;
+                                               AC_PAR_FUNCTION_TYPE);
                switch (function_id) {
                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;

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 49e939e7e5cd1a616b0772ebd7a5d9ff5c0465d8..f96e909f549c3145f5fe91cbc9c16246ce8ed391 100644 (file)
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -760,7 +760,10 @@ struct hda_codec {
        hda_nid_t mfg;  /* MFG node id */
 
        /* ids */
-       u32 function_id;
+       u8 afg_function_id;
+       u8 mfg_function_id;
+       u8 afg_unsol;
+       u8 mfg_unsol;
        u32 vendor_id;
        u32 subsystem_id;
        u32 revision_id;

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index f97d35de66c41b2e9f276ce5fec037aedde27985..f025200f2a62466fdec6a86ffbe8ae18e0ad6c15 100644 (file)
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -557,7 +557,12 @@ static void print_codec_info(struct snd_info_entry *entry,
        else
                snd_iprintf(buffer, "Not Set\n");
        snd_iprintf(buffer, "Address: %d\n", codec->addr);
-       snd_iprintf(buffer, "Function Id: 0x%x\n", codec->function_id);
+       if (codec->afg)
+               snd_iprintf(buffer, "AFG Function Id: 0x%x (unsol %u)\n",
+                       codec->afg_function_id, codec->afg_unsol);
+       if (codec->mfg)
+               snd_iprintf(buffer, "MFG Function Id: 0x%x (unsol %u)\n",
+                       codec->mfg_function_id, codec->mfg_unsol);
        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);