Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 30efd8debd1ef30be342d374f01e993509f5b76b

Authored by David Henningsson
Committed by Takashi Iwai
1 parent b531f81b0d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ALSA: hda - hdmi: Make jacks phantom, if they're not detectable 

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.

Cc: stable@vger.kernel.org
BugLink: https://bugs.launchpad.net/bugs/961286
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=903869
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

sound/pci/hda/patch_hdmi.c
Diff comments   View file @ 30efd8d
... ... @@ -1640,6 +1640,9 @@
1640 1640  
1641 1641 if (pcmdev > 0)
1642 1642 sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);
  1643 + if (!is_jack_detectable(codec, per_pin->pin_nid))
  1644 + strncat(hdmi_str, " Phantom",
  1645 + sizeof(hdmi_str) - strlen(hdmi_str) - 1);
1643 1646  
1644 1647 return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0);
1645 1648 }