2009-12-08 00:33:08

by Roel Kluin

Subject: [PATCH] ASoC: Wrong variable returned on error

The wrong variable was returned in the case of an error

Signed-off-by: Roel Kluin <[email protected]>
---
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 b838665..bffffcd 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);

2009-12-08 11:19:12

by Liam Girdwood

Subject: Re: [PATCH] ASoC: Wrong variable returned on error

On Tue, 2009-12-08 at 01:34 +0100, Roel Kluin wrote:
> The wrong variable was returned in the case of an error
>
> Signed-off-by: Roel Kluin <[email protected]>
Acked-by: Liam Girdwood <[email protected]>

2009-12-08 12:56:35

by Mark Brown

Subject: Re: [PATCH] ASoC: Wrong variable returned on error

On Tue, Dec 08, 2009 at 01:34:22AM +0100, Roel Kluin wrote:
> The wrong variable was returned in the case of an error
>
> Signed-off-by: Roel Kluin <[email protected]>

Applied, thanks.