Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84194883 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents 8a746906 370066e2

sound/soc/imx/mx1_mx2-pcm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -322,12 +322,12 @@ static int mx1_mx2_pcm_open(struct snd_pcm_substream *substream) 




	pr_debug("%s: Requesting dma channel (%s)\n", __func__,

	pr_debug("%s: Requesting dma channel (%s)\n", __func__,

						prtd->dma_params->name);

						prtd->dma_params->name);

	prtd->dma_ch = imx_dma_request_by_prio(prtd->dma_params->name,

	ret = imx_dma_request_by_prio(prtd->dma_params->name, DMA_PRIO_HIGH);

						DMA_PRIO_HIGH);

	if (ret < 0) {

	if (prtd->dma_ch < 0) {

		printk(KERN_ERR "Error %d requesting dma channel\n", ret);

		printk(KERN_ERR "Error %d requesting dma channel\n", ret);

		return ret;

		return ret;

	}

	}

	prtd->dma_ch = ret;

	imx_dma_config_burstlen(prtd->dma_ch,

	imx_dma_config_burstlen(prtd->dma_ch,

				prtd->dma_params->watermark_level);

				prtd->dma_params->watermark_level);