diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 14:28:29 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 14:28:29 +0400 |
commit | 1b4610ebf37a05a65e9f29cdf4d87c207573104d (patch) | |
tree | f2c035b44a47e4ea663449e7e2138524805d3eba /sound/soc/pxa/pxa2xx-pcm.c | |
parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) | |
parent | 97c96c076b8ef86533f2427ea145a9cd0ec5564f (diff) | |
download | linux-1b4610ebf37a05a65e9f29cdf4d87c207573104d.tar.xz |
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.39
Diffstat (limited to 'sound/soc/pxa/pxa2xx-pcm.c')
-rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 02fb66416ddc..2ce0b2d891d5 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -65,6 +65,7 @@ static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream) if (prtd->dma_ch >= 0) { pxa_free_dma(prtd->dma_ch); prtd->dma_ch = -1; + prtd->params = NULL; } return 0; |