git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 4ef7497c456b84cc06916217923a215d2e3ce9d2 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 12 Jun 2019 20:45:17 +0100
   4 Subject: [PATCH 516/782] bcm2835-sdhost: Fix DMA channel leak on error/remove
   5
   6 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
   7 ---
   8  drivers/mmc/host/bcm2835-sdhost.c | 5 ++++-
   9  1 file changed, 4 insertions(+), 1 deletion(-)
  10
  11 --- a/drivers/mmc/host/bcm2835-sdhost.c
  12 +++ b/drivers/mmc/host/bcm2835-sdhost.c
  13 @@ -2154,6 +2154,8 @@ static int bcm2835_sdhost_probe(struct p
  14
  15  err:
  16         pr_debug("bcm2835_sdhost_probe -> err %d\n", ret);
  17 +       if (host->dma_chan_rxtx)
  18 +               dma_release_channel(host->dma_chan_rxtx);
  19         mmc_free_host(mmc);
  20
  21         return ret;
  22 @@ -2174,7 +2176,8 @@ static int bcm2835_sdhost_remove(struct
  23         del_timer_sync(&host->timer);
  24
  25         tasklet_kill(&host->finish_tasklet);
  26 -
  27 +       if (host->dma_chan_rxtx)
  28 +               dma_release_channel(host->dma_chan_rxtx);
  29         mmc_free_host(host->mmc);
  30         platform_set_drvdata(pdev, NULL);
  31