diff options
| author |   Roel Kluin <roel.kluin@gmail.com> | 2009-12-08 01:34:22 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-08 12:46:11 +0000 |
| commit | 370066e2b13bafa8e742673f658e617b6ed143a4 (patch) | |
| tree | 9ca2c3ec2ac4d3ed294f5c2005e2e05dfa7806ce /sound | |
| parent | S3C64XX: Staticise platform data for PCM devices (diff) | |
| download | linux-dev-370066e2b13bafa8e742673f658e617b6ed143a4.tar.xz linux-dev-370066e2b13bafa8e742673f658e617b6ed143a4.zip | |
ASoC: Wrong variable returned on error
The wrong variable was returned in the case of an error
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
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); |