From 0acb68d5b7d0798efc3932b4057768d0d72dbd0f Mon Sep 17 00:00:00 2001 From: Zhenpeng Qian Date: Thu, 20 Dec 2012 16:20:12 +0800 Subject: [PATCH] mmc:core:if detect mmc card remove,don't wait for req done function mmc_wait_for_req call __mmc_start_req,if detect mmc card remove ,it will return -ENOMEDIUM and don't wait for req done. In this way,it can reduce io_schedule once. And if io_schedule timeout and check mmc_card_remove fail,it will call host->ops->request,(sometimes it may occur by insmod and rmmod fast), it will call msmsdcc_start_command_deferred finally , and cmd->mrq is NULL, it is init in mmc_start_request. 10 [] (__dabt_svc) from [] 11 [] (msmsdcc_start_command_deferred) from [] 12 [] (msmsdcc_start_command) from [] 13 [] (msmsdcc_request) from [] 14 [] (mmc_wait_for_req_done) from [] 15 [] (mmc_wait_for_cmd) from [] 16 [] (get_card_status) from [] 17 [] (mmc_blk_err_check) from [] 18 [] (mmc_start_req) from [] 19 [] (mmc_blk_issue_rw_rq) from [] 20 [] (mmc_blk_issue_rq) from [] 21 [] (mmc_queue_thread) from [] 22 [] (kthread) from [] Signed-off-by: Qian zhenpeng --- drivers/mmc/core/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index aaed768..fac018c 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -470,8 +470,11 @@ EXPORT_SYMBOL(mmc_start_req); */ void mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq) { - __mmc_start_req(host, mrq); - mmc_wait_for_req_done(host, mrq); + int err; + err=__mmc_start_req(host, mrq); + /* if detect mmc card remove,don't wait for req done*/ + if (!err) + mmc_wait_for_req_done(host, mrq); } EXPORT_SYMBOL(mmc_wait_for_req); -- 1.7.11.3