Greg, could you pick up this one manually? The upstream commit has no Cc to stable because it's not applicable directly to 3.4 and older kernels. So I sent this separately.
thanks, Takashi At Thu, 28 Jun 2012 07:30:39 +0200, Takashi Iwai wrote: > > 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 <[email protected]> > Signed-off-by: Takashi Iwai <[email protected]> > --- > > The original fix was already merged to Linus tree yesterday. > Please pick this up manually. Thank! > > sound/pci/hda/patch_sigmatel.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c > index 7b7a516..2b973f5 100644 > --- a/sound/pci/hda/patch_sigmatel.c > +++ b/sound/pci/hda/patch_sigmatel.c > @@ -4457,7 +4457,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 */ > @@ -4484,7 +4484,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; > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
