Merge "mmc: block: Don't unhalt if switch to CQ mode fails"

drivers/mmc/core/block.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3469,6 +3469,7 @@ static inline int mmc_blk_cmdq_part_switch(struct mmc_card *card,
		pr_err("%s: %s: mmc_blk_cmdq_switch failed: %d\n",
		mmc_hostname(host), __func__, err);
		ret = err;
		goto out;
		}
		cmdq_unhalt:
		err = mmc_cmdq_halt(host, false);