]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ALSA: hda - Don't create secondary substream when no independent-hp is used
authorTakashi Iwai <tiwai@suse.de>
Sat, 18 Jun 2011 08:58:49 +0000 (10:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 20 Jun 2011 14:24:03 +0000 (16:24 +0200)
For VIA codecs, we shouldn't create a substream for independent HP mode,
when no individual HP DAC is found.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_via.c

index 77ecc778d313de7d9b124c43c32d8b0f2905159b..78e679e76ca82a7fd10a5755c8ef22cf5fc98bad 100644 (file)
@@ -1557,6 +1557,8 @@ static int via_build_pcms(struct hda_codec *codec)
                *(spec->stream_analog_playback);
        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
                spec->multiout.dac_nids[0];
+       if (!spec->multiout.hp_nid)
+               info->stream[SNDRV_PCM_STREAM_PLAYBACK].substreams = 1;
        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];