| From 6c5c04e509b7000617b09d4301f0b9b6d171d1e6 Mon Sep 17 00:00:00 2001 |
| From: Charles Chin <Charles.Chin@idt.com> |
| Date: Thu, 13 Oct 2011 07:54:09 +0200 |
| Subject: ALSA: hda - Remove bad code for IDT 92HD83 family patch |
| |
| From: Charles Chin <Charles.Chin@idt.com> |
| |
| commit 6c5c04e509b7000617b09d4301f0b9b6d171d1e6 upstream. |
| |
| The purpose of this patch is to remove a section of "bad" code that |
| assigns the last DAC to ports E or F in order to support notebooks |
| with docking in earlier days, around ALSA 1.0.19 - 21. This is not |
| necessary now and actually breaks some configurations that use these |
| ports as other devices. This have been tested on several different |
| configurations to make sure that it is working for different combinations. |
| |
| Signed-off-by: Charles Chin <Charles.Chin@idt.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| sound/pci/hda/patch_sigmatel.c | 18 ------------------ |
| 1 file changed, 18 deletions(-) |
| |
| --- a/sound/pci/hda/patch_sigmatel.c |
| +++ b/sound/pci/hda/patch_sigmatel.c |
| @@ -5585,9 +5585,7 @@ static void stac92hd8x_fill_auto_spec(st |
| static int patch_stac92hd83xxx(struct hda_codec *codec) |
| { |
| struct sigmatel_spec *spec; |
| - hda_nid_t conn[STAC92HD83_DAC_COUNT + 1]; |
| int err; |
| - int num_dacs; |
| |
| spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| if (spec == NULL) |
| @@ -5689,22 +5687,6 @@ again: |
| return err; |
| } |
| |
| - /* docking output support */ |
| - num_dacs = snd_hda_get_connections(codec, 0xF, |
| - conn, STAC92HD83_DAC_COUNT + 1) - 1; |
| - /* skip non-DAC connections */ |
| - while (num_dacs >= 0 && |
| - (get_wcaps_type(get_wcaps(codec, conn[num_dacs])) |
| - != AC_WID_AUD_OUT)) |
| - num_dacs--; |
| - /* set port E and F to select the last DAC */ |
| - if (num_dacs >= 0) { |
| - snd_hda_codec_write_cache(codec, 0xE, 0, |
| - AC_VERB_SET_CONNECT_SEL, num_dacs); |
| - snd_hda_codec_write_cache(codec, 0xF, 0, |
| - AC_VERB_SET_CONNECT_SEL, num_dacs); |
| - } |
| - |
| codec->proc_widget_hook = stac92hd_proc_hook; |
| |
| return 0; |
