| Message ID | 1444094562-31165-4-git-send-email-mw@semihalf.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Marcin, On mar., oct. 06 2015, Marcin Wojtas <mw@semihalf.com> wrote: > 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 Good catch. Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Thanks, Gregory > --- > drivers/mmc/host/sdhci-pxav3.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > index 89a9e49..f5edf9d 100644 > --- a/drivers/mmc/host/sdhci-pxav3.c > +++ b/drivers/mmc/host/sdhci-pxav3.c > @@ -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; > -- > 1.8.3.1 >
On 6 October 2015 at 03:22, Marcin Wojtas <mw@semihalf.com> wrote: > 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 Thanks, applied for fixes! Kind regards Uffe > --- > drivers/mmc/host/sdhci-pxav3.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > index 89a9e49..f5edf9d 100644 > --- a/drivers/mmc/host/sdhci-pxav3.c > +++ b/drivers/mmc/host/sdhci-pxav3.c > @@ -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; > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks for grabbing the three patches! Best regards, Marcin 2015-10-08 19:35 GMT+02:00 Ulf Hansson <ulf.hansson@linaro.org>: > On 6 October 2015 at 03:22, Marcin Wojtas <mw@semihalf.com> wrote: >> 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 > > Thanks, applied for fixes! > > Kind regards > Uffe > >> --- >> drivers/mmc/host/sdhci-pxav3.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c >> index 89a9e49..f5edf9d 100644 >> --- a/drivers/mmc/host/sdhci-pxav3.c >> +++ b/drivers/mmc/host/sdhci-pxav3.c >> @@ -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; >> -- >> 1.8.3.1 >> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 89a9e49..f5edf9d 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -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;
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 --- drivers/mmc/host/sdhci-pxav3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)