From: Ulf Hansson <ulf.hansson@linaro.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: "Andreas Färber" <afaerber@suse.de>,
"Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
"Linux ARM" <linux-arm-kernel@lists.infradead.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] mmc: owl-mmc: Fix a resource leak in an error handling path and in the remove function
Date: Mon, 11 Jan 2021 19:05:32 +0100 [thread overview]
Message-ID: <CAPDyKFqPnbig9s2h43c07c8tyDt12sFgDZFnQ+mfh=bbtdmRcg@mail.gmail.com> (raw)
In-Reply-To: <20201209194202.54099-1-christophe.jaillet@wanadoo.fr>
On Wed, 9 Dec 2020 at 20:42, Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> '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: ff65ffe46d28 ("mmc: Add Actions Semi Owl SoCs SD/MMC driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/owl-mmc.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c
> index 53b81582f1af..5490962dc8e5 100644
> --- a/drivers/mmc/host/owl-mmc.c
> +++ b/drivers/mmc/host/owl-mmc.c
> @@ -640,7 +640,7 @@ 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,
> @@ -648,19 +648,21 @@ static int owl_mmc_probe(struct platform_device *pdev)
> 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);
>
> @@ -674,6 +676,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;
> --
> 2.27.0
>
prev parent reply other threads:[~2021-01-11 18:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 19:42 [PATCH] mmc: owl-mmc: Fix a resource leak in an error handling path and in the remove function Christophe JAILLET
2021-01-11 18:05 ` Ulf Hansson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPDyKFqPnbig9s2h43c07c8tyDt12sFgDZFnQ+mfh=bbtdmRcg@mail.gmail.com' \
--to=ulf.hansson@linaro.org \
--cc=afaerber@suse.de \
--cc=christophe.jaillet@wanadoo.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).