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

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

Merge "mmc: print an error on FLUSH timeout"

parents 9a33c4e9 2ef153af

drivers/mmc/card/block.c

+4 −1
Original line number Diff line number Diff line
@@ -1406,8 +1406,11 @@ static int mmc_blk_issue_flush(struct mmc_queue *mq, struct request *req) 
	int ret = 0;



	ret = mmc_flush_cache(card);

	if (ret)

	if (ret) {

		pr_err("%s: %s: notify flush error to upper layers",

				req->rq_disk->disk_name, __func__);

		ret = -EIO;

	}



	blk_end_request_all(req, ret);

drivers/mmc/core/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3496,7 +3496,7 @@ int mmc_flush_cache(struct mmc_card *card) 
						EXT_CSD_FLUSH_CACHE, 1,

						MMC_FLUSH_REQ_TIMEOUT_MS);

		if (err == -ETIMEDOUT) {

			pr_debug("%s: cache flush timeout\n",

			pr_err("%s: cache flush timeout\n",

					mmc_hostname(card->host));

			rc = mmc_interrupt_hpi(card);

			if (rc)