openwrt/target/linux/brcm2708/patches-4.19/950-0385-bcm2835-mmc-Handle-mmc_add_host-errors.patch

36 lines
947 B
Diff
Raw Normal View History

From 1591f5fd6fbad04bfe322a040f3ec30327ccb833 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Tue, 22 Jan 2019 12:29:45 +0100
Subject: [PATCH 385/782] bcm2835-mmc: Handle mmc_add_host() errors
The BCM2835 MMC host driver calls mmc_add_host() but doesn't check its
return value. Errors occurring in that function are therefore not
handled. Fix it.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: Frank Pavlic <f.pavlic@kunbus.de>
---
drivers/mmc/host/bcm2835-mmc.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/drivers/mmc/host/bcm2835-mmc.c
+++ b/drivers/mmc/host/bcm2835-mmc.c
@@ -1398,10 +1398,16 @@ static int bcm2835_mmc_add_host(struct b
}
mmiowb();
- mmc_add_host(mmc);
+ ret = mmc_add_host(mmc);
+ if (ret) {
+ dev_err(dev, "could not add MMC host\n");
+ goto free_irq;
+ }
return 0;
+free_irq:
+ free_irq(host->irq, host);
untasklet:
tasklet_kill(&host->finish_tasklet);