mmc: sdhci-pxav3: fix error handling of armada_38x_quirks
authorMarcin Wojtas <mw@semihalf.com>
Tue, 6 Oct 2015 01:22:37 +0000 (03:22 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 8 Oct 2015 17:24:23 +0000 (19:24 +0200)
In case of armada_38x_quirks error, all clocks should be cleaned-up, same
as after mv_conf_mbus_windows failure.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Cc: <stable@vger.kernel.org> # v4.2
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-pxav3.c

index 89a9e49e2ea8746d272e92a2bc5ee2f2c77add0a..f5edf9d3a18a2088a2b08705d876c413b1d659b5 100644 (file)
@@ -402,7 +402,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
        if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) {
                ret = armada_38x_quirks(pdev, host);
                if (ret < 0)
-                       goto err_clk_get;
+                       goto err_mbus_win;
                ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());
                if (ret < 0)
                        goto err_mbus_win;