From 5040b4b78e4cb74a6364d9a7c6cca0385e2dffd8 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Jun 2019 20:45:17 +0100 Subject: [PATCH 527/528] bcm2835-sdhost: Fix DMA channel leak on error/remove Signed-off-by: Phil Elwell --- drivers/mmc/host/bcm2835-sdhost.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/bcm2835-sdhost.c b/drivers/mmc/host/bcm2835-sdhost.c index d43af85135d3..844bed552bae 100644 --- a/drivers/mmc/host/bcm2835-sdhost.c +++ b/drivers/mmc/host/bcm2835-sdhost.c @@ -2154,6 +2154,8 @@ static int bcm2835_sdhost_probe(struct platform_device *pdev) err: pr_debug("bcm2835_sdhost_probe -> err %d\n", ret); + if (host->dma_chan_rxtx) + dma_release_channel(host->dma_chan_rxtx); mmc_free_host(mmc); return ret; @@ -2174,7 +2176,8 @@ static int bcm2835_sdhost_remove(struct platform_device *pdev) del_timer_sync(&host->timer); tasklet_kill(&host->finish_tasklet); - + if (host->dma_chan_rxtx) + dma_release_channel(host->dma_chan_rxtx); mmc_free_host(host->mmc); platform_set_drvdata(pdev, NULL); -- 2.19.1