mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 14:42:24 +00:00
mmc: 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 <sergei.shtylyov@cogentembedded.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
7f8a9a7e98
commit
2860d060ac
@ -2004,14 +2004,13 @@ int mmc_attach_mmc(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);
|
||||
mmc_claim_host(host);
|
||||
host->card = NULL;
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user