Merge branch 'for-next' into for-linus

[sfrench/cifs-2.6.git] / sound / pci / hda / hda_intel.c

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 1b46b599a5cff282dbdb02ea22202b941711d724..4b0338c4c54377faad7fc9ef429176fa08459c3a 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1350,8 +1350,12 @@ static void azx_free(struct azx *chip)
        if (hda->freed)
                return;
 
-       if (azx_has_pm_runtime(chip) && chip->running)
+       if (azx_has_pm_runtime(chip) && chip->running) {
                pm_runtime_get_noresume(&pci->dev);
+               pm_runtime_forbid(&pci->dev);
+               pm_runtime_dont_use_autosuspend(&pci->dev);
+       }
+
        chip->running = 0;
 
        azx_del_card_list(chip);
@@ -2489,9 +2493,14 @@ static const struct pci_device_id azx_ids[] = {
        /* Alderlake-P */
        { PCI_DEVICE(0x8086, 0x51c8),
          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+       { PCI_DEVICE(0x8086, 0x51cd),
+         .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
        /* Alderlake-M */
        { PCI_DEVICE(0x8086, 0x51cc),
          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+       /* Alderlake-N */
+       { PCI_DEVICE(0x8086, 0x54c8),
+         .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
        /* Elkhart Lake */
        { PCI_DEVICE(0x8086, 0x4b55),
          .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},