From 2b1f7c6f04cf45ba69047a0a87ff8bfc9ebb86ea Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 12 Jan 2012 15:36:18 +0100 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45289 Reviewed-by: Christophe PRIOUZEAU Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Ola LILJA2 --- sound/soc/ux500/ux500_msp_i2s.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sound') 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; -- cgit v1.2.3