Commit 329c6cf3 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman

mmc: sdhci-of-at91: fix memleak on clk_get failure

[ Upstream commit a04184ce ]

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: bb5f8ea4 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC")
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/b2a44d5be2e06ff075f32477e466598bb0f07b36.1577961679.git.mirq-linux@rere.qmqm.plSigned-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c659ea7b
...@@ -332,19 +332,22 @@ static int sdhci_at91_probe(struct platform_device *pdev) ...@@ -332,19 +332,22 @@ static int sdhci_at91_probe(struct platform_device *pdev)
priv->mainck = devm_clk_get(&pdev->dev, "baseclk"); priv->mainck = devm_clk_get(&pdev->dev, "baseclk");
if (IS_ERR(priv->mainck)) { if (IS_ERR(priv->mainck)) {
dev_err(&pdev->dev, "failed to get baseclk\n"); 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"); priv->hclock = devm_clk_get(&pdev->dev, "hclock");
if (IS_ERR(priv->hclock)) { if (IS_ERR(priv->hclock)) {
dev_err(&pdev->dev, "failed to get hclock\n"); 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"); priv->gck = devm_clk_get(&pdev->dev, "multclk");
if (IS_ERR(priv->gck)) { if (IS_ERR(priv->gck)) {
dev_err(&pdev->dev, "failed to get multclk\n"); 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); ret = sdhci_at91_set_clks_presets(&pdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment