mmc: block: Fix block status codes
Commit2a842acab1
("block: introduce new block status code type") changed the error type but not in patches merged through the mmc tree, like commit0493f6fe5b
("mmc: block: Move boot partition locking into a driver op"). Fix one error code that is incorrect and also use BLK_STS_OK in preference to 0. Fixes:17ece345a0
("Merge tag 'mmc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Родитель
cc4a41fe55
Коммит
a7c17d8ae4
|
@ -1213,7 +1213,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req)
|
|||
break;
|
||||
}
|
||||
mq_rq->drv_op_result = ret;
|
||||
blk_end_request_all(req, ret);
|
||||
blk_end_request_all(req, ret ? BLK_STS_IOERR : BLK_STS_OK);
|
||||
}
|
||||
|
||||
static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
|
||||
|
@ -1718,9 +1718,9 @@ static bool mmc_blk_rw_cmd_err(struct mmc_blk_data *md, struct mmc_card *card,
|
|||
if (err)
|
||||
req_pending = old_req_pending;
|
||||
else
|
||||
req_pending = blk_end_request(req, 0, blocks << 9);
|
||||
req_pending = blk_end_request(req, BLK_STS_OK, blocks << 9);
|
||||
} else {
|
||||
req_pending = blk_end_request(req, 0, brq->data.bytes_xfered);
|
||||
req_pending = blk_end_request(req, BLK_STS_OK, brq->data.bytes_xfered);
|
||||
}
|
||||
return req_pending;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче