Merge "mmc: core: fix bkops init for cmdq" (d3846f3c) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/core/mmc.c

+12 −13

Original line number	Diff line number	Diff line
		@@ -1994,19 +1994,6 @@ reinit:
		}
		}


		if (card->ext_csd.cmdq_support && (card->host->caps2 &
		MMC_CAP2_CMD_QUEUE)) {
		err = mmc_select_cmdq(card);
		if (err) {
		pr_err("%s: selecting CMDQ mode: failed: %d\n",
		mmc_hostname(card->host), err);
		card->ext_csd.cmdq_support = 0;
		oldcard = card;
		goto reinit;
		}
		}

		/*
		* Start auto bkops, if supported.
		*
		@@ -2024,6 +2011,18 @@ reinit:
		(void)mmc_set_auto_bkops(card, true);
		}

		if (card->ext_csd.cmdq_support && (card->host->caps2 &
		MMC_CAP2_CMD_QUEUE)) {
		err = mmc_select_cmdq(card);
		if (err) {
		pr_err("%s: selecting CMDQ mode: failed: %d\n",
		mmc_hostname(card->host), err);
		card->ext_csd.cmdq_support = 0;
		oldcard = card;
		goto reinit;
		}
		}

		return 0;

		free_card: