diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-06-28 07:30:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 09:03:20 -0700 |
| commit | 9fe9217b874769f0b42bc4f8de4fc3df785e9ef3 (patch) | |
| tree | cc54f56096b97401f7c67d1cbe195be63ad1e619 /sound | |
| parent | 354e550aab1074eaa87f0db4404f0edeab3ec591 (diff) | |
| download | linux-3.10-9fe9217b874769f0b42bc4f8de4fc3df785e9ef3.tar.gz linux-3.10-9fe9217b874769f0b42bc4f8de4fc3df785e9ef3.tar.bz2 linux-3.10-9fe9217b874769f0b42bc4f8de4fc3df785e9ef3.zip | |
ALSA: hda - Fix power-map regression for HP dv6 & co
commit 6e1c39c6b00d9141a82c231ba7c5e5b1716974b2 upstream.
The recent fix for power-map controls (commit b0791dda813) caused
regressions on some other HP laptops. They have fixed pins but these
pins are exposed as jack-detectable. Thus the driver tries to control
the power-map dynamically per jack detection where it never gets on.
This patch corrects the condition check for fixed pins so that the
power-map is set always for these pins.
NOTE: this is no simple backport from 3.5 kernel. Since 3.5 kernel
had significant code change in the relevant part, I fixed this
differently.
BugLink: http://bugs.launchpad.net/bugs/1013183
Reported-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 2cb1e08f962..7494fbc1f26 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4388,7 +4388,7 @@ static int stac92xx_init(struct hda_codec *codec) AC_PINCTL_IN_EN); for (i = 0; i < spec->num_pwrs; i++) { hda_nid_t nid = spec->pwr_nids[i]; - int pinctl, def_conf; + unsigned int pinctl, def_conf; /* power on when no jack detection is available */ /* or when the VREF is used for controlling LED */ @@ -4415,7 +4415,7 @@ static int stac92xx_init(struct hda_codec *codec) def_conf = get_defcfg_connect(def_conf); /* skip any ports that don't have jacks since presence * detection is useless */ - if (def_conf != AC_JACK_PORT_NONE && + if (def_conf != AC_JACK_PORT_COMPLEX || !is_jack_detectable(codec, nid)) { stac_toggle_power_map(codec, nid, 1); continue; |