3.10-stable patches

added patches:
	alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch
	alsa-pcm-don-t-leave-prepared-state-after-draining.patch

diff --git a/queue-3.10/alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch b/queue-3.10/alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch
new file mode 100644 (file)
index 0000000..b88c9ea
--- /dev/null
+++ b/queue-3.10/alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch
@@ -0,0 +1,67 @@
+From 6426460e5d87810e042962281fe3c1e8fc256162 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 19 Feb 2015 13:01:37 +0100
+Subject: ALSA: hda - Add pin configs for ASUS mobo with IDT 92HD73XX codec
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 6426460e5d87810e042962281fe3c1e8fc256162 upstream.
+
+BIOS doesn't seem to set up pins for 5.1 and the SPDIF out, so we need
+to give explicitly here.
+
+Reported-and-tested-by: Misan Thropos <misanthropos@gmx.de>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_sigmatel.c |   17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -85,6 +85,7 @@ enum {
+       STAC_ALIENWARE_M17X,
+       STAC_92HD89XX_HP_FRONT_JACK,
+       STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK,
++      STAC_92HD73XX_ASUS_MOBO,
+       STAC_92HD73XX_MODELS
+ };
+ 
+@@ -1915,7 +1916,18 @@ static const struct hda_fixup stac92hd73
+       [STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs,
+-      }
++      },
++      [STAC_92HD73XX_ASUS_MOBO] = {
++              .type = HDA_FIXUP_PINS,
++              .v.pins = (const struct hda_pintbl[]) {
++                      /* enable 5.1 and SPDIF out */
++                      { 0x0c, 0x01014411 },
++                      { 0x0d, 0x01014410 },
++                      { 0x0e, 0x01014412 },
++                      { 0x22, 0x014b1180 },
++                      { }
++              }
++      },
+ };
+ 
+ static const struct hda_model_fixup stac92hd73xx_models[] = {
+@@ -1927,6 +1939,7 @@ static const struct hda_model_fixup stac
+       { .id = STAC_DELL_M6_BOTH, .name = "dell-m6" },
+       { .id = STAC_DELL_EQ, .name = "dell-eq" },
+       { .id = STAC_ALIENWARE_M17X, .name = "alienware" },
++      { .id = STAC_92HD73XX_ASUS_MOBO, .name = "asus-mobo" },
+       {}
+ };
+ 
+@@ -1979,6 +1992,8 @@ static const struct snd_pci_quirk stac92
+                               "HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17,
+                               "unknown HP", STAC_92HD89XX_HP_FRONT_JACK),
++      SND_PCI_QUIRK(PCI_VENDOR_ID_ASUSTEK, 0x83f8, "ASUS AT4NM10",
++                    STAC_92HD73XX_ASUS_MOBO),
+       {} /* terminator */
+ };
+ 

diff --git a/queue-3.10/alsa-pcm-don-t-leave-prepared-state-after-draining.patch b/queue-3.10/alsa-pcm-don-t-leave-prepared-state-after-draining.patch
new file mode 100644 (file)
index 0000000..12027a7
--- /dev/null
+++ b/queue-3.10/alsa-pcm-don-t-leave-prepared-state-after-draining.patch
@@ -0,0 +1,32 @@
+From 70372a7566b5e552dbe48abdac08c275081d8558 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 18 Dec 2014 10:02:41 +0100
+Subject: ALSA: pcm: Don't leave PREPARED state after draining
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 70372a7566b5e552dbe48abdac08c275081d8558 upstream.
+
+When a PCM draining is performed to an empty stream that has been
+already in PREPARED state, the current code just ignores and leaves as
+it is, although the drain is supposed to set all such streams to SETUP
+state.  This patch covers that overlooked case.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/core/pcm_native.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/core/pcm_native.c
++++ b/sound/core/pcm_native.c
+@@ -1404,6 +1404,8 @@ static int snd_pcm_do_drain_init(struct
+                       if (! snd_pcm_playback_empty(substream)) {
+                               snd_pcm_do_start(substream, SNDRV_PCM_STATE_DRAINING);
+                               snd_pcm_post_start(substream, SNDRV_PCM_STATE_DRAINING);
++                      } else {
++                              runtime->status->state = SNDRV_PCM_STATE_SETUP;
+                       }
+                       break;
+               case SNDRV_PCM_STATE_RUNNING:

diff --git a/queue-3.10/series b/queue-3.10/series
index e2988f55cf0a5bd65c6a496be0b0f06c2980ca3a..d6deb48574802bc43df377caece2e798d487b2f1 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -41,3 +41,5 @@ debugfs-leave-freeing-a-symlink-body-until-inode-eviction.patch
 procfs-fix-race-between-symlink-removals-and-traversals.patch
 sunrpc-fix-braino-in-poll.patch
 tty-fix-up-atime-mtime-mess-take-four.patch
+alsa-pcm-don-t-leave-prepared-state-after-draining.patch
+alsa-hda-add-pin-configs-for-asus-mobo-with-idt-92hd73xx-codec.patch