From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 16 Mar 2015 13:48:20 +0000 (+0100)
Subject: Merge branch 'topic/hda-unbind' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a557a861ae44e1941452bc2d700f1be58c1325b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

2a557a861ae44e1941452bc2d700f1be58c1325b
diff --cc sound/pci/hda/hda_controller.c
index a438e8540763,b1143f22a0c2..4fd0b2ef26e9
--- a/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)
  {