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

Commit df50da33 authored by John Stultz's avatar John Stultz Committed by Amit Pundir
Browse files

Revert "mmc: block: Remove call to mmc_blk_set_blksize" 



This reverts commit 25a6b9535be00c88385fad39bbd2d10899578492.

Doesn't related to CONFIG_MMC_BLOCK_DEFERRED_RESUME, which
hasn't built for awhile.

Change-Id: Ic52d1465ca5d1fce6687ca40c898fcc18e11682d
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
(cherry picked from commit c52d1465ca5d1fce6687ca40c898fcc18e11682d)
parent bd355208

drivers/mmc/card/block.c

+6 −1
Original line number Diff line number Diff line
@@ -2011,6 +2011,9 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
	return 0;

}



static int

mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card);



static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)

{

	int ret;
@@ -2021,8 +2024,10 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
	unsigned int cmd_flags = req ? req->cmd_flags : 0;



#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(card->host))

	if (mmc_bus_needs_resume(card->host)) {

		mmc_resume_bus(card->host);

		mmc_blk_set_blksize(md, card);

	}

#endif



	if (req && !mq->mqrq_prev->req)