[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20130312223215.783517875@linuxfoundation.org>
Date: Tue, 12 Mar 2013 15:44:01 -0700
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org,
David Henningsson <david.henningsson@...onical.com>,
Takashi Iwai <tiwai@...e.de>
Subject: [ 40/40] Revert "ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable"
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit 30efd8debd1ef30be342d374f01e993509f5b76b upstream
(dd54ec4067a23236736afecbda120030d7ce8fe9 in this tree) as it is not
needed for the 3.4-stable tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: David Henningsson <david.henningsson@...onical.com>
Cc: Takashi Iwai <tiwai@...e.de>
---
sound/pci/hda/patch_hdmi.c | 3 ---
1 file changed, 3 deletions(-)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1244,9 +1244,6 @@ static int generic_hdmi_build_jack(struc
if (pcmdev > 0)
sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);
- if (!is_jack_detectable(codec, per_pin->pin_nid))
- strncat(hdmi_str, " Phantom",
- sizeof(hdmi_str) - strlen(hdmi_str) - 1);
return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists