sd: skip reclaiming host on mmc_add_card() error

PATCH Applied Sergei Shtylyov 1 participant 1 message Oct 14, 2015 MMC, SD and SDIO

Share & tools

Sergei Shtylyov

author

2015-10-14 20:54 UTC #0 lore raw

PATCH 2/2 sd: skip reclaiming host on mmc_add_card() error

There's little sense in releasing the host on mmc_add_card() error immediately after reclaiming it, so reclaim the host only in case of success.

Signed-off-by Sergei Shtylyov <[email protected]>

---
The patch is against Ulf Hansson's 'mmc.git' repo's 'next' branch.

 drivers/mmc/core/sd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/mmc/core/sd.c +1 -2

Index: mmc/drivers/mmc/core/sd.c
===================================================================
@@ -1243,14 +1243,13 @@ int mmc_attach_sd(struct mmc_host *host)
 
 	mmc_release_host(host);
 	err = mmc_add_card(host->card);
-	mmc_claim_host(host);
 	if (err)
 		goto remove_card;
 
+	mmc_claim_host(host);
 	return 0;
 
 remove_card:
-	mmc_release_host(host);
 	mmc_remove_card(host->card);
 	host->card = NULL;
 	mmc_claim_host(host);