[PATCH] [UBUNTU:sound/pci/hda/] Fix init verbs for ALC260 hp model

[crimsun at fungus.sh.nu]

Subject: [PATCH] [UBUNTU:sound/pci/hda/] Fix init verbs for ALC260 hp model

UpstreamStatus: Added in upstream alsa-kernel hg changeset aca7d794a097
                http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=aca7d794a097b9aa64ff7e2d8536586a494c8313;style=raw

Use the basic init verbs for ALC260 instead of hp init verbs since hp
init verbs seem incomplete and not working on some machines.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/pci/hda/patch_realtek.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

a970bb4dde7d72d414093b36e24cafb52fedefc3
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2aa1d10..401b304 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3105,6 +3105,7 @@ static struct hda_verb alc260_init_verbs
 	{ }
 };
 
+#if 0 /* should be identical with alc260_init_verbs? */
 static struct hda_verb alc260_hp_init_verbs[] = {
 	/* Headphone and output */
 	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
@@ -3151,6 +3152,7 @@ static struct hda_verb alc260_hp_init_ve
 	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
 	{ }
 };
+#endif
 
 static struct hda_verb alc260_hp_3013_init_verbs[] = {
 	/* Line out and output */
@@ -3862,7 +3864,7 @@ static struct alc_config_preset alc260_p
 		.mixers = { alc260_base_output_mixer,
 			    alc260_input_mixer,
 			    alc260_capture_alt_mixer },
-		.init_verbs = { alc260_hp_init_verbs },
+		.init_verbs = { alc260_init_verbs },
 		.num_dacs = ARRAY_SIZE(alc260_dac_nids),
 		.dac_nids = alc260_dac_nids,
 		.num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids),
-- 
1.1.3


-- 
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/20060602/60550f90/attachment.sig>