[PATCH] ALSA: ASoC: pxa-pcm-lib: initialize DMA channel to -1

[PATCH] ALSA: ASoC: pxa-pcm-lib: initialize DMA channel to -1

[Daniel Mack]

This fixes a warning ("pxa_free_dma: trying to free channel 0 which is
already freed") when a device was opened but the hw_params() call
failed.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Nicolas Pitre <nico@marvell.com>
---
 sound/arm/pxa2xx-pcm-lib.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 743ac6a..fd51fa8 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -205,6 +205,7 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
 	if (!rtd->dma_desc_array)
 		goto err1;
 
+	rtd->dma_ch = -1;
 	runtime->private_data = rtd;
 	return 0;
 
-- 
1.6.3.3

Re: [PATCH] ALSA: ASoC: pxa-pcm-lib: initialize DMA channel to -1

[Daniel Mack]

Any oppinion about this one?

(Sorry for the clock skew - the virtual machine I did this in lives in
 its own world)

On Sun, Feb 28, 2010 at 10:42:38AM +0800, Daniel Mack wrote:
> This fixes a warning ("pxa_free_dma: trying to free channel 0 which is
> already freed") when a device was opened but the hw_params() call
> failed.
> 
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Liam Girdwood <lrg@slimlogic.co.uk>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Nicolas Pitre <nico@marvell.com>
> ---
>  sound/arm/pxa2xx-pcm-lib.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
> index 743ac6a..fd51fa8 100644
> --- a/sound/arm/pxa2xx-pcm-lib.c
> +++ b/sound/arm/pxa2xx-pcm-lib.c
> @@ -205,6 +205,7 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
>  	if (!rtd->dma_desc_array)
>  		goto err1;
>  
> +	rtd->dma_ch = -1;
>  	runtime->private_data = rtd;
>  	return 0;
>  
> -- 
> 1.6.3.3
> 

Re: [PATCH] ALSA: ASoC: pxa-pcm-lib: initialize DMA channel to -1

[Mark Brown]

On Sat, Mar 20, 2010 at 04:47:15PM +0100, Daniel Mack wrote:
> Any oppinion about this one?

It's probably OK, but I'll wait for Liam.

> (Sorry for the clock skew - the virtual machine I did this in lives in
>  its own world)

Your clock skew buries it in mail folders.

Re: [PATCH] ALSA: ASoC: pxa-pcm-lib: initialize DMA channel to -1

[Liam Girdwood]

On Sat, 2010-03-20 at 16:34 +0000, Mark Brown wrote:
> On Sat, Mar 20, 2010 at 04:47:15PM +0100, Daniel Mack wrote:
> > Any oppinion about this one?
> 
> It's probably OK, but I'll wait for Liam.
> 
> > (Sorry for the clock skew - the virtual machine I did this in lives in
> >  its own world)
> 
> Your clock skew buries it in mail folders.

That maybe why I missed it.

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

-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk