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,f089fa0aa03dcc9c228c36f44f09615cf084efb5..f7581079aefe3e4a212fb30449c82e2c69ef55b6
--- 1/sound/pci/hda/hda_intel.c
--- 2/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -3882,9 -3831,11 +3884,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 */