From: Takashi Iwai Date: Fri, 28 Jul 2006 12:44:31 +0000 (+0200) Subject: [ALSA] Don't set up the same PID twice in snd_hda_multi_out_analog_prepare X-Git-Tag: v2.6.19-rc1~1270^2~114 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=35aec4e2affb99d52b4b744ddb09767eb6e05580;p=~andy%2Flinux [ALSA] Don't set up the same PID twice in snd_hda_multi_out_analog_prepare Check the hp_nid whether it's identical with front pin to avoid the setup of the same widget node twice. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 399860c36be..ff29d0f1690 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1942,7 +1942,7 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o /* front */ snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag, 0, format); - if (mout->hp_nid) + if (mout->hp_nid && mout->hp_nid != nids[HDA_FRONT]) /* headphone out will just decode front left/right (stereo) */ snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format); /* extra outputs copied from front */