diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-07-28 08:44:31 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 04:39:27 -0400 |
| commit | 35aec4e2affb99d52b4b744ddb09767eb6e05580 (patch) | |
| tree | 610f3cccb7640ef907f5582f9181991aa4e9871b /sound | |
| parent | 4b146cb087b4a668511f6c991da1dc40e2e04b0d (diff) | |
[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 <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 399860c36be9..ff29d0f16903 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 | |||
| 1942 | 1942 | ||
| 1943 | /* front */ | 1943 | /* front */ |
| 1944 | snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag, 0, format); | 1944 | snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag, 0, format); |
| 1945 | if (mout->hp_nid) | 1945 | if (mout->hp_nid && mout->hp_nid != nids[HDA_FRONT]) |
| 1946 | /* headphone out will just decode front left/right (stereo) */ | 1946 | /* headphone out will just decode front left/right (stereo) */ |
| 1947 | snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format); | 1947 | snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format); |
| 1948 | /* extra outputs copied from front */ | 1948 | /* extra outputs copied from front */ |