Merge "mmc: block: Do not call post_req in DCMD case" (a0778607) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/card/block.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2979,11 +2979,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);
		@@ -3195,7 +3195,7 @@ void mmc_blk_cmdq_complete_rq(struct request *rq)
		else
		BUG_ON(!test_and_clear_bit(cmdq_req->tag,
		&ctx_info->data_active_reqs));

		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);