1 files changed, 41 insertions, 33 deletions

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 4ebfbd874c9..431c0d417ee 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -49,6 +49,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/asoundef.h>
 #include "hda_codec.h"
@@ -1506,39 +1507,49 @@ static int via_build_pcms(struct hda_codec *codec)
         struct via_spec *spec = codec->spec;
         struct hda_pcm *info = spec->pcm_rec;
 
-        codec->num_pcms = 1;
+        codec->num_pcms = 0;
         codec->pcm_info = info;
 
-        snprintf(spec->stream_name_analog, sizeof(spec->stream_name_analog),
-                 "%s Analog", codec->chip_name);
-        info->name = spec->stream_name_analog;
+        if (spec->multiout.num_dacs || spec->num_adc_nids) {
+                snprintf(spec->stream_name_analog,
+                         sizeof(spec->stream_name_analog),
+                         "%s Analog", codec->chip_name);
+                info->name = spec->stream_name_analog;
 
-        if (!spec->stream_analog_playback)
-                spec->stream_analog_playback = &via_pcm_analog_playback;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
-                *spec->stream_analog_playback;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
-                spec->multiout.dac_nids[0];
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =
-                spec->multiout.max_channels;
+                if (spec->multiout.num_dacs) {
+                        if (!spec->stream_analog_playback)
+                                spec->stream_analog_playback =
+                                        &via_pcm_analog_playback;
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
+                                *spec->stream_analog_playback;
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
+                                spec->multiout.dac_nids[0];
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =
+                                spec->multiout.max_channels;
+                }
 
-        if (!spec->stream_analog_capture) {
-                if (spec->dyn_adc_switch)
-                        spec->stream_analog_capture =
-                                &via_pcm_dyn_adc_analog_capture;
-                else
-                        spec->stream_analog_capture = &via_pcm_analog_capture;
+                if (!spec->stream_analog_capture) {
+                        if (spec->dyn_adc_switch)
+                                spec->stream_analog_capture =
+                                        &via_pcm_dyn_adc_analog_capture;
+                        else
+                                spec->stream_analog_capture =
+                                        &via_pcm_analog_capture;
+                }
+                if (spec->num_adc_nids) {
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] =
+                                *spec->stream_analog_capture;
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid =
+                                spec->adc_nids[0];
+                        if (!spec->dyn_adc_switch)
+                                info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams =
+                                        spec->num_adc_nids;
+                }
+                codec->num_pcms++;
+                info++;
         }
-        info->stream[SNDRV_PCM_STREAM_CAPTURE] =
-                *spec->stream_analog_capture;
-        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
-        if (!spec->dyn_adc_switch)
-                info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams =
-                        spec->num_adc_nids;
 
         if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
-                codec->num_pcms++;
-                info++;
                 snprintf(spec->stream_name_digital,
                          sizeof(spec->stream_name_digital),
                          "%s Digital", codec->chip_name);
@@ -1562,17 +1573,19 @@ static int via_build_pcms(struct hda_codec *codec)
                         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid =
                                 spec->dig_in_nid;
                 }
+                codec->num_pcms++;
+                info++;
         }
 
         if (spec->hp_dac_nid) {
-                codec->num_pcms++;
-                info++;
                 snprintf(spec->stream_name_hp, sizeof(spec->stream_name_hp),
                          "%s HP", codec->chip_name);
                 info->name = spec->stream_name_hp;
                 info->stream[SNDRV_PCM_STREAM_PLAYBACK] = via_pcm_hp_playback;
                 info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
                         spec->hp_dac_nid;
+                codec->num_pcms++;
+                info++;
         }
         return 0;
 }
@@ -3688,13 +3701,8 @@ static const struct hda_verb vt1812_init_verbs[] = {
 static void set_widgets_power_state_vt1812(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
-        int imux_is_smixer =
-        snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
         unsigned int parm;
         unsigned int present;
-        /* MUX10 (1eh) = stereo mixer */
-        imux_is_smixer =
-        snd_hda_codec_read(codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
         /* inputs */
         /* PW 5/6/7 (29h/2ah/2bh) */
         parm = AC_PWRST_D3;