On Thu, Feb 10, 2011 at 06:07:30PM +0100, Wolfram Sang wrote:
> Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
> Cc: Olof Johansson <olof@xxxxxxxxx>
> Cc: Chris Ball <cjb@xxxxxxxxxx>
> ---
>
> Found the leak while working on the esdhc-imx driver. Not even compile tested,
> please check.
Olof, do you have a minute for this one?
>
> drivers/mmc/host/sdhci-tegra.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 4823ee9..f7e1f96 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -169,7 +169,7 @@ static int tegra_sdhci_pltfm_init(struct sdhci_host *host,
> if (rc) {
> dev_err(mmc_dev(host->mmc),
> "failed to allocate wp gpio\n");
> - goto out_cd;
> + goto out_irq;
> }
> tegra_gpio_enable(plat->wp_gpio);
> gpio_direction_input(plat->wp_gpio);
> @@ -195,6 +195,9 @@ out_wp:
> gpio_free(plat->wp_gpio);
> }
>
> +out_irq:
> + if (gpio_is_valid(plat->cd_gpio))
> + free_irq(gpio_to_irq(plat->cd_gpio), host);
> out_cd:
> if (gpio_is_valid(plat->cd_gpio)) {
> tegra_gpio_disable(plat->cd_gpio);
> @@ -225,6 +228,7 @@ static void tegra_sdhci_pltfm_exit(struct sdhci_host *host)
> }
>
> if (gpio_is_valid(plat->cd_gpio)) {
> + free_irq(gpio_to_irq(plat->cd_gpio), host);
> tegra_gpio_disable(plat->cd_gpio);
> gpio_free(plat->cd_gpio);
> }
> --
> 1.7.2.3
>
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature
