Merge branch 'x86/cleanups' into perf/uprobes

Merge reason: We want to merge a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 948f0be2f4f..9dbb5735d77 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4629,7 +4629,7 @@ static void stac92xx_hp_detect(struct hda_codec *codec)
                 unsigned int val = AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN;
                 if (no_hp_sensing(spec, i))
                         continue;
-                if (presence)
+                if (1 /*presence*/)
                         stac92xx_set_pinctl(codec, cfg->hp_pins[i], val);
 #if 0 /* FIXME */
 /* Resetting the pinctl like below may lead to (a sort of) regressions
@@ -5078,9 +5078,9 @@ static int stac92xx_update_led_status(struct hda_codec *codec)
                                 spec->gpio_dir, spec->gpio_data);
         } else {
                 notmtd_lvl = spec->gpio_led_polarity ?
-                                AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_GRD;
+                                AC_PINCTL_VREF_50 : AC_PINCTL_VREF_GRD;
                 muted_lvl = spec->gpio_led_polarity ?
-                                AC_PINCTL_VREF_GRD : AC_PINCTL_VREF_HIZ;
+                                AC_PINCTL_VREF_GRD : AC_PINCTL_VREF_50;
                 spec->vref_led = muted ? muted_lvl : notmtd_lvl;
                 stac_vrefout_set(codec, spec->vref_mute_led_nid,
                                  spec->vref_led);