3.4-stable patches

added patches:
	revert-alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch

diff --git a/queue-3.4/revert-alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch b/queue-3.4/revert-alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch
new file mode 100644 (file)
index 0000000..e2ca6b6
--- /dev/null
+++ b/queue-3.4/revert-alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch
@@ -0,0 +1,30 @@
+From foo@baz Tue Mar 12 15:18:13 PDT 2013
+Date: Tue, 12 Mar 2013 15:18:13 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: Revert "ALSA: hda - hdmi: Make jacks phantom, if they're not detectable"
+
+This reverts commit 30efd8debd1ef30be342d374f01e993509f5b76b upstream
+(dd54ec4067a23236736afecbda120030d7ce8fe9 in this tree) as it is not
+needed for the 3.4-stable tree.
+
+Cc: David Henningsson <david.henningsson@canonical.com>
+Cc: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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);
+ }

diff --git a/queue-3.4/series b/queue-3.4/series
index 9743dc8666bec79c9d3be42fb41e7b7d1fce2c7a..a9b72abb8e8d795fafcb0da85c54496a2e8c714b 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -38,3 +38,4 @@ dmi_scan-fix-missing-check-for-_dmi_-signature-in-smbios_present.patch
 usb-don-t-use-ehci-port-sempahore-for-usb-3.0-hubs.patch
 usb-prepare-for-refactoring-by-adding-extra-udev-checks.patch
 usb-rip-out-recursive-call-on-warm-port-reset.patch
+revert-alsa-hda-hdmi-make-jacks-phantom-if-they-re-not-detectable.patch