From: Ulf Hansson <ulf.hansson@linaro.org>
To: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure
Date: Thu, 16 Jan 2020 15:39:50 +0100 [thread overview]
Message-ID: <CAPDyKFoJzcRDEx9HD3XngbbaMJcj1LEJ2OeLKdvNKG_rxuWFkg@mail.gmail.com> (raw)
In-Reply-To: <b2a44d5be2e06ff075f32477e466598bb0f07b36.1577961679.git.mirq-linux@rere.qmqm.pl>
On Thu, 2 Jan 2020 at 11:42, Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
>
> sdhci_alloc_host() does its work not using managed infrastructure, so
> needs explicit free on error path. Add it where needed.
>
> Cc: <stable@vger.kernel.org>
> Fixes: bb5f8ea4d514 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC")
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-of-at91.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index b2a8c45c9c23..ab2bd314a390 100644
> --- a/drivers/mmc/host/sdhci-of-at91.c
> +++ b/drivers/mmc/host/sdhci-of-at91.c
> @@ -345,20 +345,23 @@ static int sdhci_at91_probe(struct platform_device *pdev)
> priv->mainck = NULL;
> } else {
> dev_err(&pdev->dev, "failed to get baseclk\n");
> - return PTR_ERR(priv->mainck);
> + ret = PTR_ERR(priv->mainck);
> + goto sdhci_pltfm_free;
> }
> }
>
> priv->hclock = devm_clk_get(&pdev->dev, "hclock");
> if (IS_ERR(priv->hclock)) {
> dev_err(&pdev->dev, "failed to get hclock\n");
> - return PTR_ERR(priv->hclock);
> + ret = PTR_ERR(priv->hclock);
> + goto sdhci_pltfm_free;
> }
>
> priv->gck = devm_clk_get(&pdev->dev, "multclk");
> if (IS_ERR(priv->gck)) {
> dev_err(&pdev->dev, "failed to get multclk\n");
> - return PTR_ERR(priv->gck);
> + ret = PTR_ERR(priv->gck);
> + goto sdhci_pltfm_free;
> }
>
> ret = sdhci_at91_set_clks_presets(&pdev->dev);
> --
> 2.20.1
>
prev parent reply other threads:[~2020-01-16 14:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 10:42 [PATCH] mmc: sdhci-of-at91: fix memleak on clk_get failure Michał Mirosław
2020-01-09 7:19 ` Ludovic Desroches
2020-01-14 12:10 ` Adrian Hunter
2020-01-16 14:39 ` 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=CAPDyKFoJzcRDEx9HD3XngbbaMJcj1LEJ2OeLKdvNKG_rxuWFkg@mail.gmail.com \
--to=ulf.hansson@linaro.org \
--cc=adrian.hunter@intel.com \
--cc=alexandre.belloni@bootlin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=mirq-linux@rere.qmqm.pl \
--cc=nicolas.ferre@microchip.com \
/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).