[PATCH] mmc: sdhci: add error checking for mmc_add_host

[PATCH] mmc: sdhci: add error checking for mmc_add_host

[Jaehoon Chung]

Sometimes we can't add the device,but we didn't check any error status.
Need to check error status for mmc_add_host.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/mmc/host/sdhci.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 9e15f41..9c777bc 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2025,7 +2025,9 @@ int sdhci_add_host(struct sdhci_host *host)
 
 	mmiowb();
 
-	mmc_add_host(mmc);
+	ret = mmc_add_host(mmc);
+	if (unlikely(ret))
+		goto err_free_mmc;
 
 	printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s\n",
 		mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
@@ -2041,6 +2043,9 @@ reset:
 	sdhci_reset(host, SDHCI_RESET_ALL);
 	free_irq(host->irq, host);
 #endif
+err_free_mmc:
+	mmc_free_host(host);
+
 untasklet:
 	tasklet_kill(&host->card_tasklet);
 	tasklet_kill(&host->finish_tasklet);

Re: [PATCH] mmc: sdhci: add error checking for mmc_add_host

[Wolfram Sang]

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

On Mon, Apr 04, 2011 at 11:48:57AM +0900, Jaehoon Chung wrote:
> Sometimes we can't add the device,but we didn't check any error status.
> Need to check error status for mmc_add_host.

Thanks, this is correct, but...

> -	mmc_add_host(mmc);
> +	ret = mmc_add_host(mmc);
> +	if (unlikely(ret))
> +		goto err_free_mmc;

... you are leaking the irq and the lcd_classdev here.

Regards,

   Wolfram

-- 
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: add error checking for mmc_add_host

[Jaehoon Chung]

Wolfram Sang wrote:
> On Mon, Apr 04, 2011 at 11:48:57AM +0900, Jaehoon Chung wrote:
>> Sometimes we can't add the device,but we didn't check any error status.
>> Need to check error status for mmc_add_host.
> 
> Thanks, this is correct, but...
> 
>> -	mmc_add_host(mmc);
>> +	ret = mmc_add_host(mmc);
>> +	if (unlikely(ret))
>> +		goto err_free_mmc;
> 
> ... you are leaking the irq and the lcd_classdev here.

Thanks for your comment, i will resend the patch.

> 
> Regards,
> 
>    Wolfram
>