[PATCH] [UBUNTU:sound/pci/hda/] Fix erroneous re-initialisation of pins

[crimsun at fungus.sh.nu]

From 2e363f0d2f1fd0950802777aec1782c520075389 Mon Sep 17 00:00:00 2001
From: Daniel T Chen <crimsun at ubuntu.com>
Date: Mon, 31 Jul 2006 01:29:33 -0400
Subject: [PATCH] [UBUNTU:sound/pci/hda/] Fix erroneous re-initialisation of pins

UpstreamStatus: Added in upstream alsa-kernel hg changeset:
                0dc37f0a3a6a [http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=0dc37f0a3a6a921441a9e95094f1a5a9f168e9f0;style=raw]

In hda_codec.c::snd_hda_multi_out_analog_prepare(), check if hp_nid is
identical to the front pin to avoid re-initialising it.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 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 ef8652c..3b51be1 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1897,7 +1897,7 @@ int snd_hda_multi_out_analog_prepare(str
 
 	/* 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 */
-- 
1.4.1

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060730/7ac1092f/attachment.sig>