2019-08-09 17:50:30 +00:00
|
|
|
From 0e3b70d74a8ab5187a05e48dfec974f650cfbd83 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
Date: Wed, 12 Jun 2019 20:45:17 +0100
|
2019-08-09 17:50:30 +00:00
|
|
|
Subject: [PATCH 517/773] bcm2835-sdhost: Fix DMA channel leak on error/remove
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/mmc/host/bcm2835-sdhost.c | 5 ++++-
|
|
|
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/mmc/host/bcm2835-sdhost.c
|
|
|
|
|
+++ b/drivers/mmc/host/bcm2835-sdhost.c
|
|
|
|
|
@@ -2154,6 +2154,8 @@ static int bcm2835_sdhost_probe(struct p
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
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);
|
|
|
|
|
|
