]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
mmc: sdhci-of-at91: fix memleak on clk_get failure
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>
Thu, 2 Jan 2020 10:42:16 +0000 (11:42 +0100)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 13 Mar 2020 04:31:00 +0000 (00:31 -0400)
BugLink: https://bugs.launchpad.net/bugs/1866678
[ Upstream commit a04184ce777b46e92c2b3c93c6dcb2754cb005e1 ]

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>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/b2a44d5be2e06ff075f32477e466598bb0f07b36.1577961679.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/mmc/host/sdhci-of-at91.c

index 1ebcf0eb781ea6cae8dc9cf4ae12b53cfdf03b96..04e88d4796fa98769606f9770b03b608c11e0dc4 100644 (file)
@@ -332,19 +332,22 @@ static int sdhci_at91_probe(struct platform_device *pdev)
        priv->mainck = devm_clk_get(&pdev->dev, "baseclk");
        if (IS_ERR(priv->mainck)) {
                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);