1
0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-10-21 15:08:15 +02:00
openwrt/target/linux/bcm27xx/patches-4.19/950-0332-bcm2835-mmc-Fix-duplicate-free_irq-on-remove.patch
Adrian Schmutzler 7d7aa2fd92 brcm2708: rename target to bcm27xx
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>
2020-02-14 14:10:51 +01:00

39 lines
1.4 KiB
Diff

From 4a15e086fa9531f808c15b8fb8d7ed1fdb411b74 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Sat, 19 Jan 2019 09:00:26 +0100
Subject: [PATCH] bcm2835-mmc: Fix duplicate free_irq() on remove
The BCM2835 MMC host driver requests its interrupt as a device-managed
resource, so the interrupt is automatically freed after the driver is
unbound.
However on driver unbind, bcm2835_mmc_remove() frees the interrupt
explicitly to avoid invocation of the interrupt handler after driver
structures have been torn down.
The interrupt is thus freed twice, leading to a WARN splat in
__free_irq(). Fix by not requesting the interrupt as a device-managed
resource.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: Frank Pavlic <f.pavlic@kunbus.de>
---
drivers/mmc/host/bcm2835-mmc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/mmc/host/bcm2835-mmc.c
+++ b/drivers/mmc/host/bcm2835-mmc.c
@@ -1389,9 +1389,9 @@ static int bcm2835_mmc_add_host(struct b
init_waitqueue_head(&host->buf_ready_int);
bcm2835_mmc_init(host, 0);
- ret = devm_request_threaded_irq(dev, host->irq, bcm2835_mmc_irq,
- bcm2835_mmc_thread_irq, IRQF_SHARED,
- mmc_hostname(mmc), host);
+ ret = request_threaded_irq(host->irq, bcm2835_mmc_irq,
+ bcm2835_mmc_thread_irq, IRQF_SHARED,
+ mmc_hostname(mmc), host);
if (ret) {
dev_err(dev, "Failed to request IRQ %d: %d\n", host->irq, ret);
goto untasklet;