]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ASoC: pxa-pcm-lib: initialize DMA channel to -1
authorDaniel Mack <daniel@caiaq.de>
Sun, 28 Feb 2010 02:42:38 +0000 (10:42 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 19 Mar 2010 15:28:04 +0000 (15:28 +0000)
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>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/arm/pxa2xx-pcm-lib.c

index 743ac6a2906598fdbd70a04f6a3c6910fd86fdfe..fd51fa8b06a12cea27815c2ec9b121841cbc3076 100644 (file)
@@ -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;