diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 13:20:31 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 13:20:31 +0200 |
commit | 0ba86d7edea1f9f2d9497c31200910263e8b4128 (patch) | |
tree | 387f713e1afdd181e92699dcaa5fa3d45b30c75b /sound/pci/hda/patch_sigmatel.c | |
parent | 973b659cbf2604b0b52829c224f6064d64118818 (diff) | |
parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
download | op-kernel-dev-0ba86d7edea1f9f2d9497c31200910263e8b4128.zip op-kernel-dev-0ba86d7edea1f9f2d9497c31200910263e8b4128.tar.gz |
Merge commit 'v3.3-rc6'
Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.
Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 6345df1..9dbb573 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 |