Skip to content

L
linux-davinci
Commit 84194883 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'topic/asoc' into for-linus

parents 8a746906 370066e2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sound/soc/imx/mx1_mx2-pcm.c
View file @ 84194883
...@@ -322,12 +322,12 @@ static int mx1_mx2_pcm_open(struct snd_pcm_substream *substream) ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment