From 313d5a3851a40ea408b20f1184ff067aa7a4f386 Mon Sep 17 00:00:00 2001 From: Ritesh Harjani Date: Mon, 23 Nov 2015 11:46:45 +0530 Subject: [PATCH] mmc: block: Do not call post_req in DCMD case No need to call post_req if it's a DCMD request completion. Change-Id: Id11165967e316b1e556aaeb6d67bd18844cee6e1 Signed-off-by: Ritesh Harjani --- drivers/mmc/card/block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 6364a777db80..02f2d323704e 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -3070,11 +3070,11 @@ static void mmc_blk_cmdq_reset_all(struct mmc_host *host, int err) if (!ret) { WARN_ON(!test_and_clear_bit(itag, &ctx_info->data_active_reqs)); + mmc_cmdq_post_req(host, itag, err); } else { clear_bit(CMDQ_STATE_DCMD_ACTIVE, &ctx_info->curr_state); } - mmc_cmdq_post_req(host, itag, err); WARN_ON(!test_and_clear_bit(itag, &ctx_info->active_reqs)); mmc_host_clk_release(host); @@ -3286,8 +3286,8 @@ void mmc_blk_cmdq_complete_rq(struct request *rq) else BUG_ON(!test_and_clear_bit(cmdq_req->tag, &ctx_info->data_active_reqs)); - - mmc_cmdq_post_req(host, cmdq_req->tag, err); + if (!is_dcmd) + mmc_cmdq_post_req(host, cmdq_req->tag, err); if (cmdq_req->cmdq_req_flags & DCMD) { clear_bit(CMDQ_STATE_DCMD_ACTIVE, &ctx_info->curr_state); blk_end_request_all(rq, err);