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

Commit 2986d0bf authored by Pierre Ossman's avatar Pierre Ossman
Browse files

mmc: Don't hold lock when releasing an added card 



When the card has been added to the device model, it might be bound
to a card driver. Therefore, we have to release the host lock when
trying to remove it as we otherwise might deadlock with the driver.

Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent cf795bfb

drivers/mmc/core/mmc.c

+8 −5
Original line number Diff line number Diff line
@@ -499,14 +499,17 @@ static void mmc_resume(struct mmc_host *host) 
	BUG_ON(!host->card);



	mmc_claim_host(host);



	err = mmc_init_card(host, host->ocr, host->card);

	mmc_release_host(host);



	if (err != MMC_ERR_NONE) {

		mmc_remove(host);



		mmc_claim_host(host);

		mmc_detach_bus(host);

		mmc_release_host(host);

	}



	mmc_release_host(host);

}



#else
@@ -567,14 +570,14 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr) 


	err = mmc_add_card(host->card);

	if (err)

		goto reclaim_host;

		goto remove_card;



	return 0;



reclaim_host:

	mmc_claim_host(host);

remove_card:

	mmc_remove_card(host->card);

	host->card = NULL;

	mmc_claim_host(host);

err:

	mmc_detach_bus(host);

	mmc_release_host(host);

drivers/mmc/core/sd.c

+8 −5
Original line number Diff line number Diff line
@@ -573,14 +573,17 @@ static void mmc_sd_resume(struct mmc_host *host) 
	BUG_ON(!host->card);



	mmc_claim_host(host);



	err = mmc_sd_init_card(host, host->ocr, host->card);

	mmc_release_host(host);



	if (err != MMC_ERR_NONE) {

		mmc_sd_remove(host);



		mmc_claim_host(host);

		mmc_detach_bus(host);

		mmc_release_host(host);

	}



	mmc_release_host(host);

}



#else
@@ -648,14 +651,14 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr) 


	err = mmc_add_card(host->card);

	if (err)

		goto reclaim_host;

		goto remove_card;



	return 0;



reclaim_host:

	mmc_claim_host(host);

remove_card:

	mmc_remove_card(host->card);

	host->card = NULL;

	mmc_claim_host(host);

err:

	mmc_detach_bus(host);

	mmc_release_host(host);