diff options
author | Charles Chin <Charles.Chin@idt.com> | 2011-10-13 01:54:09 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-10-13 02:05:30 -0400 |
commit | 6c5c04e509b7000617b09d4301f0b9b6d171d1e6 (patch) | |
tree | 5e4afa8e53751191ae636caefe171f5acab9b31f /sound/pci | |
parent | d5cf9911988287e819ce98ccd9f61ca82fbc90c6 (diff) |
ALSA: hda - Remove bad code for IDT 92HD83 family patch
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>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 1e0b3387e700..59a52a430f24 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -5589,9 +5589,7 @@ static void stac92hd8x_fill_auto_spec(struct hda_codec *codec) | |||
5589 | static int patch_stac92hd83xxx(struct hda_codec *codec) | 5589 | static int patch_stac92hd83xxx(struct hda_codec *codec) |
5590 | { | 5590 | { |
5591 | struct sigmatel_spec *spec; | 5591 | struct sigmatel_spec *spec; |
5592 | hda_nid_t conn[STAC92HD83_DAC_COUNT + 1]; | ||
5593 | int err; | 5592 | int err; |
5594 | int num_dacs; | ||
5595 | 5593 | ||
5596 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); | 5594 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
5597 | if (spec == NULL) | 5595 | if (spec == NULL) |
@@ -5693,22 +5691,6 @@ again: | |||
5693 | return err; | 5691 | return err; |
5694 | } | 5692 | } |
5695 | 5693 | ||
5696 | /* docking output support */ | ||
5697 | num_dacs = snd_hda_get_connections(codec, 0xF, | ||
5698 | conn, STAC92HD83_DAC_COUNT + 1) - 1; | ||
5699 | /* skip non-DAC connections */ | ||
5700 | while (num_dacs >= 0 && | ||
5701 | (get_wcaps_type(get_wcaps(codec, conn[num_dacs])) | ||
5702 | != AC_WID_AUD_OUT)) | ||
5703 | num_dacs--; | ||
5704 | /* set port E and F to select the last DAC */ | ||
5705 | if (num_dacs >= 0) { | ||
5706 | snd_hda_codec_write_cache(codec, 0xE, 0, | ||
5707 | AC_VERB_SET_CONNECT_SEL, num_dacs); | ||
5708 | snd_hda_codec_write_cache(codec, 0xF, 0, | ||
5709 | AC_VERB_SET_CONNECT_SEL, num_dacs); | ||
5710 | } | ||
5711 | |||
5712 | codec->proc_widget_hook = stac92hd_proc_hook; | 5694 | codec->proc_widget_hook = stac92hd_proc_hook; |
5713 | 5695 | ||
5714 | return 0; | 5696 | return 0; |