diff options
| author | Sergei Shtylyov | 2015-10-14 22:53:03 +0200 |
|---|---|---|
| committer | Ulf Hansson | 2015-10-26 16:00:14 +0100 |
| commit | 2860d060ac902df0164cc9580f843b101e27a2c6 (patch) | |
| tree | 43e730efdee8406e8105b43743523af41849cd01 /drivers/mmc | |
| parent | mmc: android-goldfish: Allow compiling the driver with COMPILE_TEST (diff) | |
| download | kernel-qcow2-linux-2860d060ac902df0164cc9580f843b101e27a2c6.tar.gz kernel-qcow2-linux-2860d060ac902df0164cc9580f843b101e27a2c6.tar.xz kernel-qcow2-linux-2860d060ac902df0164cc9580f843b101e27a2c6.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 3 | ||||
| -rw-r--r-- | drivers/mmc/core/sd.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 479b84a00bd7..c793fda27321 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -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; diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index b1b9200a4715..141eaa923e18 100644 --- a/drivers/mmc/core/sd.c +++ b/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); |