2019-09-19 14:43:19 +00:00
|
|
|
From 82ced13dc5805f6e49e2182269e672b20d8394bc 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 08:06:48 +0100
|
2019-12-23 12:42:55 +00:00
|
|
|
Subject: [PATCH] bcm2835-mmc: Fix struct mmc_host leak on probe
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
The BCM2835 MMC host driver requests the bus address of the host's
|
|
|
|
|
register map on probe. If that fails, the driver leaks the struct
|
|
|
|
|
mmc_host allocated earlier.
|
|
|
|
|
|
|
|
|
|
Fix it.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Lukas Wunner <lukas@wunner.de>
|
|
|
|
|
Cc: Frank Pavlic <f.pavlic@kunbus.de>
|
|
|
|
|
---
|
|
|
|
|
drivers/mmc/host/bcm2835-mmc.c | 3 ++-
|
|
|
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/mmc/host/bcm2835-mmc.c
|
|
|
|
|
+++ b/drivers/mmc/host/bcm2835-mmc.c
|
|
|
|
|
@@ -1439,7 +1439,8 @@ static int bcm2835_mmc_probe(struct plat
|
|
|
|
|
addr = of_get_address(node, 0, NULL, NULL);
|
|
|
|
|
if (!addr) {
|
|
|
|
|
dev_err(dev, "could not get DMA-register address\n");
|
|
|
|
|
- return -ENODEV;
|
|
|
|
|
+ ret = -ENODEV;
|
|
|
|
|
+ goto err;
|
|
|
|
|
}
|
|
|
|
|
host->bus_addr = be32_to_cpup(addr);
|
|
|
|
|
pr_debug(" - ioaddr %lx, iomem->start %lx, bus_addr %lx\n",
|
