mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-11-24 04:19:51 +00:00
Merge branch 'topic/asoc' into for-linus
This commit is contained in:
commit
84194883bc
@ -322,12 +322,12 @@ static int mx1_mx2_pcm_open(struct snd_pcm_substream *substream)
|
||||
|
||||
pr_debug("%s: Requesting dma channel (%s)\n", __func__,
|
||||
prtd->dma_params->name);
|
||||
prtd->dma_ch = imx_dma_request_by_prio(prtd->dma_params->name,
|
||||
DMA_PRIO_HIGH);
|
||||
if (prtd->dma_ch < 0) {
|
||||
ret = imx_dma_request_by_prio(prtd->dma_params->name, DMA_PRIO_HIGH);
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR "Error %d requesting dma channel\n", ret);
|
||||
return ret;
|
||||
}
|
||||
prtd->dma_ch = ret;
|
||||
imx_dma_config_burstlen(prtd->dma_ch,
|
||||
prtd->dma_params->watermark_level);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user