dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Merge branch 'topic/asoc' into for-linus

Browse source
This commit is contained in:
Takashi Iwai 2009-12-09 18:16:15 +01:00
commit 84194883bc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/imx/mx1_mx2-pcm.c
View file

@ -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);