This change takes care of releasing mmc resources on error cases in
probe function which was missing. Also release timer in remove function.
Cc: Ludovic Desroches <ludovic.desroc...@atmel.com>
Cc: Chris Ball <ch...@printf.net>
Cc: Ulf Hansson <ulf.hans...@linaro.org>
Cc: linux-...@vger.kernel.org
Signed-off-by: Pramod Gurav <pramod.gu...@smartplayin.com>
---
drivers/mmc/host/atmel-mci.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 21a222c..6db1531 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2373,7 +2373,7 @@ static int __init atmci_probe(struct platform_device
*pdev)
struct resource *regs;
unsigned int nr_slots;
int irq;
- int ret;
+ int ret, i;
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!regs)
@@ -2480,7 +2480,7 @@ static int __init atmci_probe(struct platform_device
*pdev)
if (!host->buffer) {
ret = -ENOMEM;
dev_err(&pdev->dev, "buffer allocation failed\n");
- goto err_init_slot;
+ goto err_dma_alloc;
}
}
@@ -2490,10 +2490,16 @@ static int __init atmci_probe(struct platform_device
*pdev)
return 0;
+err_dma_alloc:
+ for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
+ if (host->slot[i])
+ atmci_cleanup_slot(host->slot[i], i);
+ }
+
err_init_slot:
+ del_timer_sync(&host->timer);
if (host->dma.chan)
dma_release_channel(host->dma.chan);
-
return ret;
}
@@ -2517,6 +2523,7 @@ static int __exit atmci_remove(struct platform_device
*pdev)
atmci_readl(host, ATMCI_SR);
clk_disable_unprepare(host->mck);
+ del_timer_sync(&host->timer);
if (host->dma.chan)
dma_release_channel(host->dma.chan);
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
