Merge branch 'topic/hda-unbind' into for-next

diff --cc sound/core/device.c
Simple merge

diff --cc sound/pci/hda/hda_controller.c
index a438e8540763711f479f894b27d6f239f28c637a,b1143f22a0c251ec0bb077873ab35dcf56b974ed..4fd0b2ef26e9f469ce964d954b6170b638266402
--- 1/sound/pci/hda/hda_controller.c
--- 2/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@@ -974,15 -984,11 +984,10 @@@ static int azx_attach_pcm_stream(struc
   */
  static int azx_alloc_cmd_io(struct azx *chip)
  {
-       int err;
- 
        /* single page (at least 4096 bytes) must suffice for both ringbuffes */
-       err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
-                                        PAGE_SIZE, &chip->rb);
-       if (err < 0)
-               dev_err(chip->card->dev, "cannot allocate CORB/RIRB\n");
-       return err;
+       return chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
+                                         PAGE_SIZE, &chip->rb);
  }
 -EXPORT_SYMBOL_GPL(azx_alloc_cmd_io);
  
  static void azx_init_cmd_io(struct azx *chip)
  {

diff --cc sound/pci/hda/hda_generic.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/hda/hda_proc.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge