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

Commit de9cef6b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: card: WARN_ON in cmdq completion context"

parents bd560ba7 59759255

drivers/mmc/card/block.c

+2 −2
Original line number Diff line number Diff line
@@ -3630,7 +3630,7 @@ void mmc_blk_cmdq_complete_rq(struct request *rq) 
	 * or disable state so cannot receive any completion of

	 * other requests.

	 */

	BUG_ON(test_bit(CMDQ_STATE_ERR, &ctx_info->curr_state));

	WARN_ON(test_bit(CMDQ_STATE_ERR, &ctx_info->curr_state));



	/* clear pending request */

	BUG_ON(!test_and_clear_bit(cmdq_req->tag,
@@ -3664,7 +3664,7 @@ void mmc_blk_cmdq_complete_rq(struct request *rq) 
out:



	mmc_cmdq_clk_scaling_stop_busy(host, true, is_dcmd);

	if (!test_bit(CMDQ_STATE_ERR, &ctx_info->curr_state)) {

	if (!(err || cmdq_req->resp_err)) {

		mmc_host_clk_release(host);

		wake_up(&ctx_info->wait);

		mmc_put_card(host->card);