aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 6b7eeba656ed..d9a89ced3c89 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2972,8 +2972,8 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
2972 "Front", "Surround", NULL /*CLFE*/, "Side" 2972 "Front", "Surround", NULL /*CLFE*/, "Side"
2973 }; 2973 };
2974 hda_nid_t nid = 0; 2974 hda_nid_t nid = 0;
2975 int i, err, num_dacs; 2975 int i, err;
2976 unsigned int wid_caps, pincap; 2976 unsigned int wid_caps;
2977 2977
2978 for (i = 0; i < cfg->line_outs && spec->multiout.dac_nids[i]; i++) { 2978 for (i = 0; i < cfg->line_outs && spec->multiout.dac_nids[i]; i++) {
2979 nid = spec->multiout.dac_nids[i]; 2979 nid = spec->multiout.dac_nids[i];
@@ -4033,7 +4033,6 @@ static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,
4033 * "xxx as Output" mixer switch 4033 * "xxx as Output" mixer switch
4034 */ 4034 */
4035 struct sigmatel_spec *spec = codec->spec; 4035 struct sigmatel_spec *spec = codec->spec;
4036 struct auto_pin_cfg *cfg = &spec->autocfg;
4037 if (nid == spec->line_switch || nid == spec->mic_switch) 4036 if (nid == spec->line_switch || nid == spec->mic_switch)
4038 return; 4037 return;
4039 } 4038 }