lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Pierre Ossman
2007-07-22 17:52:06 +02:00
parent cf795bfb3a
commit 2986d0bf23
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/core/mmc.c
View File

@@ -499,14 +499,17 @@ static void mmc_resume(struct mmc_host *host)
BUG_ON(!host->card); BUG_ON(!host->card);
mmc_claim_host(host); mmc_claim_host(host);
err = mmc_init_card(host, host->ocr, host->card); err = mmc_init_card(host, host->ocr, host->card);
mmc_release_host(host);
if (err != MMC_ERR_NONE) { if (err != MMC_ERR_NONE) {
mmc_remove(host); mmc_remove(host);
mmc_claim_host(host);
mmc_detach_bus(host); mmc_detach_bus(host);
mmc_release_host(host);
} }
mmc_release_host(host);
} }
#else #else
@@ -567,14 +570,14 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
err = mmc_add_card(host->card); err = mmc_add_card(host->card);
if (err) if (err)
goto reclaim_host; goto remove_card;
return 0; return 0;
reclaim_host: remove_card:
mmc_claim_host(host);
mmc_remove_card(host->card); mmc_remove_card(host->card);
host->card = NULL; host->card = NULL;
mmc_claim_host(host);
err: err:
mmc_detach_bus(host); mmc_detach_bus(host);
mmc_release_host(host); mmc_release_host(host);

13
drivers/mmc/core/sd.c
View File

@@ -573,14 +573,17 @@ static void mmc_sd_resume(struct mmc_host *host)
BUG_ON(!host->card); BUG_ON(!host->card);
mmc_claim_host(host); mmc_claim_host(host);
err = mmc_sd_init_card(host, host->ocr, host->card); err = mmc_sd_init_card(host, host->ocr, host->card);
mmc_release_host(host);
if (err != MMC_ERR_NONE) { if (err != MMC_ERR_NONE) {
mmc_sd_remove(host); mmc_sd_remove(host);
mmc_claim_host(host);
mmc_detach_bus(host); mmc_detach_bus(host);
mmc_release_host(host);
} }
mmc_release_host(host);
} }
#else #else
@@ -648,14 +651,14 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr)
err = mmc_add_card(host->card); err = mmc_add_card(host->card);
if (err) if (err)
goto reclaim_host; goto remove_card;
return 0; return 0;
reclaim_host: remove_card:
mmc_claim_host(host);
mmc_remove_card(host->card); mmc_remove_card(host->card);
host->card = NULL; host->card = NULL;
mmc_claim_host(host);
err: err:
mmc_detach_bus(host); mmc_detach_bus(host);
mmc_release_host(host); mmc_release_host(host);