diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-09 18:16:15 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-09 18:16:15 +0100 |
| commit | 84194883bcf89383ea4230116bb0195af5ec5829 (patch) | |
| tree | d1766dc385655a2a546e757b597d122557378aef /sound | |
| parent | 8a7469064b7f601a661059e9fcd2f2deb2a8fd23 (diff) | |
| parent | 370066e2b13bafa8e742673f658e617b6ed143a4 (diff) | |
| download | linux-stable-84194883bcf89383ea4230116bb0195af5ec5829.tar.gz linux-stable-84194883bcf89383ea4230116bb0195af5ec5829.tar.bz2 linux-stable-84194883bcf89383ea4230116bb0195af5ec5829.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/imx/mx1_mx2-pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/imx/mx1_mx2-pcm.c b/sound/soc/imx/mx1_mx2-pcm.c index b83866529397..bffffcd5ff34 100644 --- a/sound/soc/imx/mx1_mx2-pcm.c +++ b/sound/soc/imx/mx1_mx2-pcm.c @@ -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); |