[PATCH 1/5 RFC] mmc: sdhci-iproc: Clean up platform allocations if shdci init fails

Ulf Hansson ulf.hansson at linaro.org
Wed Jan 27 06:16:15 PST 2016


On 17 January 2016 at 15:59, Stefan Wahren <stefan.wahren at i2se.com> wrote:
> This patch adopts the changes from 475c9e43bfa7 ("mmc: sdhci-bcm2835:
> Clean up platform allocations if sdhci init fails") to sdhci-iproc.
>
> Signed-off-by: Stefan Wahren <stefan.wahren at i2se.com>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-iproc.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
> index 3b423b0..e22060a 100644
> --- a/drivers/mmc/host/sdhci-iproc.c
> +++ b/drivers/mmc/host/sdhci-iproc.c
> @@ -213,7 +213,11 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
>                 host->caps1 = iproc_host->data->caps1;
>         }
>
> -       return sdhci_add_host(host);
> +       ret = sdhci_add_host(host);
> +       if (ret)
> +               goto err;
> +
> +       return 0;
>
>  err:
>         sdhci_pltfm_free(pdev);
> --
> 1.7.9.5
>



More information about the linux-rpi-kernel mailing list