diff options
| author | Maxime Coquelin <maxime.coquelin@stericsson.com> | 2012-01-12 15:36:18 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:01:07 +0100 |
| commit | 7f3055ab5a090dbcc53818cdf03ccc2b75e1c566 (patch) | |
| tree | 5177804fae21c68ab2df9d76c22f66b60bcad1b1 /sound | |
| parent | 839b93f2048bd572d8ea1e2737181ce33e282376 (diff) | |
ASoC: Ux500: Fix merge error causing DMA leak
ST-Ericsson ID: 409827
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I600d0cd772b1921c8c310bfd5cd35795389ff67b
Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45289
Reviewed-by: Christophe PRIOUZEAU <christophe.priouzeau@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 360405a7c09..91a9a03f93d 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -322,6 +322,11 @@ void ux500_msp_i2s_configure_dma(struct msp *msp, struct msp_config *config) msp->tx_pipeid = NULL; } + if (msp->rx_pipeid != NULL) { + dma_release_channel(msp->rx_pipeid); + msp->rx_pipeid = NULL; + } + switch (config->data_size) { case MSP_DATA_BITS_32: word_width = STEDMA40_WORD_WIDTH; |