Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8154b575 authored by Wolfram Sang's avatar Wolfram Sang Committed by Chris Ball
Browse files

mmc: sdhci-tegra: free irq on error and remove 



Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent f53fbde4

drivers/mmc/host/sdhci-tegra.c

+5 −1
Original line number Diff line number Diff line
@@ -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 @@ static int tegra_sdhci_pltfm_init(struct sdhci_host *host, 
		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);

	}