Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2860d060 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Ulf Hansson
Browse files

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 7f8a9a7e

drivers/mmc/core/mmc.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/core/sd.c

+1 −2
Original line number Diff line number Diff line
@@ -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);