diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 12:53:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 12:53:36 -0800 |
| commit | 9278e634b4e063f415b46923a9ca4e74f42ec932 (patch) | |
| tree | ae5c5eef151bbfef5135a5cb04c23113d2f16fc8 /sound/soc/imx/imx-pcm-dma-mx2.c | |
| parent | d71f5be276bf79eda14c40f3cafcf827326f10cb (diff) | |
| parent | 986b2f2c21b308e21160a40359b81370f8fee6ec (diff) | |
| download | linux-9278e634b4e063f415b46923a9ca4e74f42ec932.tar.gz linux-9278e634b4e063f415b46923a9ca4e74f42ec932.tar.bz2 linux-9278e634b4e063f415b46923a9ca4e74f42ec932.zip | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: Wait for WM8993 FLL to stabilise
ASoC: core - Free platform DAPM context at platform removal.
ASoC: dapm - Fix check for codec context in dapm_power_widgets().
ASoC: sgtl5000: update author email address
ASoC: Fix DMA channel leak in imx-pcm-dma-mx2 driver.
Diffstat (limited to 'sound/soc/imx/imx-pcm-dma-mx2.c')
| -rw-r--r-- | sound/soc/imx/imx-pcm-dma-mx2.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c index aecdba9f65a1..5780c9b9d569 100644 --- a/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/sound/soc/imx/imx-pcm-dma-mx2.c @@ -88,11 +88,13 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream, iprtd->dma_data.dma_request = dma_params->dma; /* Try to grab a DMA channel */ - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - iprtd->dma_chan = dma_request_channel(mask, filter, iprtd); - if (!iprtd->dma_chan) - return -EINVAL; + if (!iprtd->dma_chan) { + dma_cap_zero(mask); + dma_cap_set(DMA_SLAVE, mask); + iprtd->dma_chan = dma_request_channel(mask, filter, iprtd); + if (!iprtd->dma_chan) + return -EINVAL; + } switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: |