mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
Merge branch 'topic/asoc' into for-linus
This commit is contained in:
commit
84194883bc
1 changed files with 3 additions and 3 deletions
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue