Merge remote-tracking branch 'sound/for-next'

diff --cc sound/firewire/scs1x.c
Simple merge

diff --cc sound/pci/hda/Kconfig
Simple merge

diff --cc sound/pci/hda/hda_intel.c
index 35e9f8b010a7555e89cd3bac9b70113c795435e0,f39de9055097979f93efa3a05a630b8ffa945107..8860dd529520d0335264af050fdb918ae47c1c60
--- 1/sound/pci/hda/hda_intel.c
--- 2/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -2953,9 -2962,8 +2972,10 @@@ static int azx_runtime_suspend(struct d
        struct azx *chip = card->private_data;
  
        azx_stop_chip(chip);
+       azx_enter_link_reset(chip);
        azx_clear_irq_pending(chip);
 +      if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
 +              hda_display_power(false);
        return 0;
  }
  
@@@ -3882,9 -3848,11 +3901,8 @@@ static void azx_remove(struct pci_dev *
  {
        struct snd_card *card = pci_get_drvdata(pci);
  
 -      if (pci_dev_run_wake(pci))
 -              pm_runtime_get_noresume(&pci->dev);
 -
        if (card)
                snd_card_free(card);
-       pci_set_drvdata(pci, NULL);
  }
  
  /* PCI IDs */