Merge "mmc: block: fix partition switch failure observed during shutdown" (0d9bec62) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/card/block.c

+11 −10

Original line number	Diff line number	Diff line
		@@ -2913,6 +2913,7 @@ static void mmc_blk_cmdq_shutdown(struct mmc_queue *mq)
		}

		/* disable CQ mode in card */
		if (mmc_card_cmdq(card)) {
		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
		EXT_CSD_CMDQ, 0,
		card->ext_csd.generic_cmd6_time);
		@@ -2920,11 +2921,11 @@ static void mmc_blk_cmdq_shutdown(struct mmc_queue *mq)
		pr_err("%s: failed to switch card to legacy mode: %d\n",
		__func__, err);
		goto out;
		} else {
		}
		mmc_card_clr_cmdq(card);
		}
		host->cmdq_ops->disable(host, false);
		host->card->cmdq_init = false;
		}
		out:
		mmc_host_clk_release(host);
		mmc_put_card(card);