Re: [PATCH 4/5] mmc: sdhci: Fix error paths in sdhci_add_host()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



[...]

>
>         pr_info("%s: SDHCI controller on %s [%s] using %s\n",
>                 mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
> @@ -3331,15 +3337,27 @@ int sdhci_add_host(struct sdhci_host *host)
>
>         return 0;
>
> +unled:
>  #ifdef SDHCI_USE_LEDS_CLASS

Shouldn't this ifdef be removed in the earlier patch?

> -reset:
> +       led_classdev_unregister(&host->led);
> +unirq:
> +#endif
>         sdhci_do_reset(host, SDHCI_RESET_ALL);
>         sdhci_writel(host, 0, SDHCI_INT_ENABLE);
>         sdhci_writel(host, 0, SDHCI_SIGNAL_ENABLE);
>         free_irq(host->irq, host);
> -#endif
>  untasklet:
>         tasklet_kill(&host->finish_tasklet);
> +unreg:
> +       if (!IS_ERR(mmc->supply.vqmmc))
> +               regulator_disable(mmc->supply.vqmmc);
> +undma:
> +       if (host->align_buffer)
> +               dma_free_coherent(mmc_dev(mmc), host->align_buffer_sz +
> +                                 host->adma_table_sz, host->align_buffer,
> +                                 host->align_addr);
> +       host->adma_table = NULL;
> +       host->align_buffer = NULL;
>
>         return ret;
>  }
> --
> 1.9.1
>

Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux USB Devel]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux