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

[net-next-2.6.git] / sound / pci / hda / hda_proc.c

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);