On Mon, 2013-03-04 at 03:38 +0000, Ben Hutchings wrote: > 3.2-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: David Henningsson <david.hennings...@canonical.com> > > commit 30efd8debd1ef30be342d374f01e993509f5b76b upstream. > > Just as for analog codecs, a jack that isn't suitable for detection > (in this case, NO_PRESENCE was set) should be a phantom Jack > instead of a normal one. > > Thanks to Raymond Yau for spotting. > > BugLink: https://bugs.launchpad.net/bugs/961286 > BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=903869 > Signed-off-by: David Henningsson <david.hennings...@canonical.com> > Signed-off-by: Takashi Iwai <ti...@suse.de> > [bwh: Backported to 3.2: adjust context] > Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
David, do I need to change this further for 3.2.y? Ben. > --- > sound/pci/hda/patch_hdmi.c | 3 +++ > 1 file changed, 3 insertions(+) > > --- a/sound/pci/hda/patch_hdmi.c > +++ b/sound/pci/hda/patch_hdmi.c > @@ -1228,6 +1228,9 @@ static int generic_hdmi_build_jack(struc > int pcmdev = spec->pcm_rec[pin_idx].device; > > snprintf(hdmi_str, sizeof(hdmi_str), "HDMI/DP,pcm=%d", pcmdev); > + if (!is_jack_detectable(codec, per_pin->pin_nid)) > + strncat(hdmi_str, " Phantom", > + sizeof(hdmi_str) - strlen(hdmi_str) - 1); > > err = snd_hda_input_jack_add(codec, per_pin->pin_nid, > SND_JACK_VIDEOOUT, pcmdev > 0 ? hdmi_str : NULL); > > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
signature.asc
Description: This is a digitally signed message part
