2019-08-09 17:50:30 +00:00
|
|
|
From 931465226104cb10935af8f66fe6fdd29d898ec9 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Lukas Wunner <lukas@wunner.de>
|
|
|
|
|
Date: Sat, 19 Jan 2019 09:00:26 +0100
|
2019-08-09 17:50:30 +00:00
|
|
|
Subject: [PATCH 385/773] bcm2835-mmc: Fix duplicate free_irq() on remove
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
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;
|
