From fbe4cbb8d86f7c391462f21fa0315e014ce45f48 Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Tue, 22 Jan 2019 12:29:45 +0100 Subject: [PATCH 391/432] 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 Cc: Frank Pavlic --- drivers/mmc/host/bcm2835-mmc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c index 3e920936fb78..f14f46a71534 100644 --- 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 bcm2835_host *host) } 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); -- 2.19.1