mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
32 lines
958 B
Diff
32 lines
958 B
Diff
From 73623c76c8bc8c41a4afefc1eee84dfc5979d652 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 12 Jun 2019 20:45:17 +0100
|
|
Subject: [PATCH] bcm2835-sdhost: Fix DMA channel leak on error/remove
|
|
|
|
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);
|
|
|