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

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

Merge "mmc: core/card: maintain clock gating reference count integrity"

parents f503e594 838cdd04

drivers/mmc/card/block.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2900,7 +2900,7 @@ static void mmc_blk_cmdq_shutdown(struct mmc_queue *mq) 
	err = mmc_cmdq_halt(host, true);

	err = mmc_cmdq_halt(host, true);

	if (err) {

	if (err) {

		pr_err("%s: halt: failed: %d\n", __func__, err);

		pr_err("%s: halt: failed: %d\n", __func__, err);

		return;

		goto out;

	}

	}





	/* disable CQ mode in card */

	/* disable CQ mode in card */

drivers/mmc/core/mmc.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1404,7 +1404,6 @@ static int mmc_select_cmdq(struct mmc_card *card) 
		mmc_card_clr_cmdq(card);

		mmc_card_clr_cmdq(card);

		ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_CMDQ, 0,

		ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_CMDQ, 0,

				 card->ext_csd.generic_cmd6_time);

				 card->ext_csd.generic_cmd6_time);

		if (ret)

		goto out;

		goto out;

	}

	}