From b3e1cf31154136da855f3cb6117c17eb0b6bcfb4 Mon Sep 17 00:00:00 2001

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Date: Sun, 7 Aug 2022 08:56:38 +0200

Subject: [PATCH] mmc: meson-gx: Fix an error handling path in meson_mmc_probe()

Git-commit: b3e1cf31154136da855f3cb6117c17eb0b6bcfb4

Patch-mainline: v6.0-rc2

References: git-fixes

The commit in Fixes has introduced a new error handling which should goto

the existing error handling path.

Otherwise some resources leak.

Fixes: 19c6beaa064c ("mmc: meson-gx: add device reset")

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Cc: stable@vger.kernel.org

Link: https://lore.kernel.org/r/be4b863bacf323521ba3a02efdc4fca9cdedd1a6.1659855351.git.christophe.jaillet@wanadoo.fr

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/mmc/host/meson-gx-mmc.c | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c

index 2f08d442e557..fc462995cf94 100644

--- a/drivers/mmc/host/meson-gx-mmc.c

+++ b/drivers/mmc/host/meson-gx-mmc.c

@@ -1172,8 +1172,10 @@ static int meson_mmc_probe(struct platform_device *pdev)

 	}

 	ret = device_reset_optional(&pdev->dev);

-	if (ret)

-		return dev_err_probe(&pdev->dev, ret, "device reset failed\n");

+	if (ret) {

+		dev_err_probe(&pdev->dev, ret, "device reset failed\n");

+		goto free_host;

+	}

 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

 	host->regs = devm_ioremap_resource(&pdev->dev, res);

-- 

2.35.3