Merge branch 'for-linus' into for-next

Just to catch up a few small fixes for HD-audio and DMA engine.

4 files changed, 14 insertions, 6 deletions

diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c
index 94d08733cb38..76cbb9ec953a 100644
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@ -182,6 +182,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream)
 int snd_dmaengine_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
         int ret;
 
         switch (cmd) {
@@ -196,6 +197,11 @@ int snd_dmaengine_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 dmaengine_resume(prtd->dma_chan);
                 break;
         case SNDRV_PCM_TRIGGER_SUSPEND:
+                if (runtime->info & SNDRV_PCM_INFO_PAUSE)
+                        dmaengine_pause(prtd->dma_chan);
+                else
+                        dmaengine_terminate_all(prtd->dma_chan);
+                break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
                 dmaengine_pause(prtd->dma_chan);
                 break;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index ab0fd6d4961b..cd77b9b19b73 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1743,6 +1743,9 @@ static const struct pci_device_id azx_ids[] = {
         /* Lynx Point */
         { PCI_DEVICE(0x8086, 0x8c20),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+        /* 9 Series */
+        { PCI_DEVICE(0x8086, 0x8ca0),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
         /* Wellsburg */
         { PCI_DEVICE(0x8086, 0x8d20),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 40ba06eb44af..06275f8807a8 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -332,6 +332,7 @@ static const struct hda_fixup ad1986a_fixups[] = {
 
 static const struct snd_pci_quirk ad1986a_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC),
+        SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD),
         SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK),
         SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8200, "ASUS M2", AD1986A_FIXUP_3STACK),
         SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_FIXUP_3STACK),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a00cd69bc3aa..12fb411adf77 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1649,12 +1649,10 @@ static const struct hda_fixup alc260_fixups[] = {
         [ALC260_FIXUP_COEF] = {
                 .type = HDA_FIXUP_VERBS,
                 .v.verbs = (const struct hda_verb[]) {
-                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
-                        { 0x20, AC_VERB_SET_PROC_COEF,  0x3040 },
+                        { 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 },
+                        { 0x1a, AC_VERB_SET_PROC_COEF,  0x3040 },
                         { }
                 },
-                .chained = true,
-                .chain_id = ALC260_FIXUP_HP_PIN_0F,
         },
         [ALC260_FIXUP_GPIO1] = {
                 .type = HDA_FIXUP_VERBS,
@@ -1669,8 +1667,8 @@ static const struct hda_fixup alc260_fixups[] = {
         [ALC260_FIXUP_REPLACER] = {
                 .type = HDA_FIXUP_VERBS,
                 .v.verbs = (const struct hda_verb[]) {
-                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
-                        { 0x20, AC_VERB_SET_PROC_COEF,  0x3050 },
+                        { 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 },
+                        { 0x1a, AC_VERB_SET_PROC_COEF,  0x3050 },
                         { }
                 },
                 .chained = true,