[alsa-devel] [PATCH] ASoC: Tegra: Fix error handling in DMA channel alloc

Liam Girdwood lrg at slimlogic.co.uk
Mon Feb 28 16:08:29 CET 2011


On Tue, 2011-02-22 at 20:16 -0700, Stephen Warren wrote:
> tegra_dma_allocate_channel() returns NULL on errors, not an error pointer.
> 
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
> ---
>  sound/soc/tegra/tegra_pcm.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
> index 40540b1..3c271f9 100644
> --- a/sound/soc/tegra/tegra_pcm.c
> +++ b/sound/soc/tegra/tegra_pcm.c
> @@ -161,8 +161,8 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream)
>  	prtd->dma_req[1].dev = prtd;
>  
>  	prtd->dma_chan = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT);
> -	if (IS_ERR(prtd->dma_chan)) {
> -		ret = PTR_ERR(prtd->dma_chan);
> +	if (prtd->dma_chan == NULL) {
> +		ret = -ENOMEM;
>  		goto err;
>  	}
>  

Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>



More information about the Alsa-devel mailing list