From 5cc8490e1a8a8caaaea149fa8055027a1fcb1411 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 6 Mar 2009 09:43:58 +0100 Subject: [PATCH] --- yaml --- r: 132023 b: refs/heads/master c: c50ff7c04225c945b13d410d50fde6ff6c59d7ee h: refs/heads/master i: 132021: 89b7e690629c5e9f59ea66cb580ee16b2ac1c2de 132019: 1cf69377d89efb5f050ff0c3e5651b3b438980cc 132015: 566300c767fc407db41e7e02406921f98446b4f7 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cd4623369aa1..3428e1d71911 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14b97595e0e1f47b6f809e180e5bcd8dcd995690 +refs/heads/master: c50ff7c04225c945b13d410d50fde6ff6c59d7ee diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index 995b413078f5..6094344fb223 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -3516,6 +3516,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out if (! spec->autocfg.line_outs) return 0; /* can't find valid pin config */ +#if 0 /* FIXME: temporarily disabled */ /* If we have no real line-out pin and multiple hp-outs, HPs should * be set up as multi-channel outputs. */ @@ -3535,6 +3536,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out spec->autocfg.line_out_type = AUTO_PIN_HP_OUT; spec->autocfg.hp_outs = 0; } +#endif /* FIXME: temporarily disabled */ if (spec->autocfg.mono_out_pin) { int dir = get_wcaps(codec, spec->autocfg.mono_out_pin) & (AC_WCAP_OUT_AMP | AC_WCAP_IN_AMP);