Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2162d9f4 authored by Marcin Wojtas's avatar Marcin Wojtas Committed by Ulf Hansson
Browse files

mmc: sdhci-pxav3: fix error handling of armada_38x_quirks 



In case of armada_38x_quirks error, all clocks should be cleaned-up, same
as after mv_conf_mbus_windows failure.

Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
Cc: <stable@vger.kernel.org> # v4.2
Reviewed-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent fa796414

drivers/mmc/host/sdhci-pxav3.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -402,7 +402,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) 
	if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) {

	if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) {

		ret = armada_38x_quirks(pdev, host);

		ret = armada_38x_quirks(pdev, host);

		if (ret < 0)

		if (ret < 0)

			goto err_clk_get;

			goto err_mbus_win;

		ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());

		ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());

		if (ret < 0)

		if (ret < 0)

			goto err_mbus_win;

			goto err_mbus_win;