Skip to content

Commit

Permalink
mmc: owl-mmc: Fix a resource leak in an error handling path and in th…
Browse files Browse the repository at this point in the history
…e remove function

[ Upstream commit 5d15cbf ]

'dma_request_chan()' calls should be balanced by a corresponding
'dma_release_channel()' call.

Add the missing call both in the error handling path of the probe function
and in the remove function.

Fixes: ff65ffe ("mmc: Add Actions Semi Owl SoCs SD/MMC driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20201209194202.54099-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tititiou36 authored and gregkh committed Mar 4, 2021
1 parent 99e7c8d commit 34251b8
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/mmc/host/owl-mmc.c
Expand Up @@ -641,27 +641,29 @@ static int owl_mmc_probe(struct platform_device *pdev)
owl_host->irq = platform_get_irq(pdev, 0);
if (owl_host->irq < 0) {
ret = -EINVAL;
goto err_free_host;
goto err_release_channel;
}

ret = devm_request_irq(&pdev->dev, owl_host->irq, owl_irq_handler,
0, dev_name(&pdev->dev), owl_host);
if (ret) {
dev_err(&pdev->dev, "Failed to request irq %d\n",
owl_host->irq);
goto err_free_host;
goto err_release_channel;
}

ret = mmc_add_host(mmc);
if (ret) {
dev_err(&pdev->dev, "Failed to add host\n");
goto err_free_host;
goto err_release_channel;
}

dev_dbg(&pdev->dev, "Owl MMC Controller Initialized\n");

return 0;

err_release_channel:
dma_release_channel(owl_host->dma);
err_free_host:
mmc_free_host(mmc);

Expand All @@ -675,6 +677,7 @@ static int owl_mmc_remove(struct platform_device *pdev)

mmc_remove_host(mmc);
disable_irq(owl_host->irq);
dma_release_channel(owl_host->dma);
mmc_free_host(mmc);

return 0;
Expand Down

0 comments on commit 34251b8

Please sign in to comment.