[PATCH] mmc: sdhci-tegra: free irq on error and remove

[PATCH] mmc: sdhci-tegra: free irq on error and remove

[Wolfram Sang]

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Olof Johansson <olof@lixom.net>
Cc: Chris Ball <cjb@laptop.org>
---

Found the leak while working on the esdhc-imx driver. Not even compile tested,
please check.

 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

Re: [PATCH] mmc: sdhci-tegra: free irq on error and remove

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1675 bytes --]

On Thu, Feb 10, 2011 at 06:07:30PM +0100, Wolfram Sang wrote:
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Chris Ball <cjb@laptop.org>
> ---
> 
> 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 #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] mmc: sdhci-tegra: free irq on error and remove

[Olof Johansson]

On Sun, Feb 20, 2011 at 11:21 PM, Wolfram Sang <w.sang@pengutronix.de> wrote:
> On Thu, Feb 10, 2011 at 06:07:30PM +0100, Wolfram Sang wrote:
>> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
>> Cc: Olof Johansson <olof@lixom.net>
>> Cc: Chris Ball <cjb@laptop.org>
>> ---
>>
>> 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?

Yeah, my bad -- I thought I had already acked it.

Acked-by: Olof Johansson <olof@lixom.net>

Re: [PATCH] mmc: sdhci-tegra: free irq on error and remove

[Chris Ball]

Hi,

On Mon, Feb 21, 2011 at 01:35:36PM -0800, Olof Johansson wrote:
> >> 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?
> 
> Yeah, my bad -- I thought I had already acked it.
> 
> Acked-by: Olof Johansson <olof@lixom.net>

Thanks, pushed to mmc-next for .39.

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child