diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-02-10 18:07:30 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-03-15 13:49:35 -0400 |
| commit | 8154b5756d3cb850f846ff38cf35cbbb7c2b45fe (patch) | |
| tree | bb16bd7fddbdd5bbda162650ae4f6cbfd35b1835 /drivers/mmc/host/sdhci-tegra.c | |
| parent | f53fbde48ef0a5ce7733fbc84da18014d0a11cf0 (diff) | |
| download | kernel_samsung_smdk4412-8154b5756d3cb850f846ff38cf35cbbb7c2b45fe.zip kernel_samsung_smdk4412-8154b5756d3cb850f846ff38cf35cbbb7c2b45fe.tar.gz kernel_samsung_smdk4412-8154b5756d3cb850f846ff38cf35cbbb7c2b45fe.tar.bz2 | |
mmc: sdhci-tegra: free irq on error and remove
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-tegra.c')
| -rw-r--r-- | 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); } |