Commit a7c17d8a authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson

mmc: block: Fix block status codes

Commit 2a842aca ("block: introduce new block status code type") changed
the error type but not in patches merged through the mmc tree, like
commit 0493f6fe ("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: 17ece345 ("Merge tag 'mmc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc")
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent cc4a41fe
...@@ -1213,7 +1213,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) ...@@ -1213,7 +1213,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req)
break; break;
} }
mq_rq->drv_op_result = ret; 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) 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, ...@@ -1718,9 +1718,9 @@ static bool mmc_blk_rw_cmd_err(struct mmc_blk_data *md, struct mmc_card *card,
if (err) if (err)
req_pending = old_req_pending; req_pending = old_req_pending;
else else
req_pending = blk_end_request(req, 0, blocks << 9); req_pending = blk_end_request(req, BLK_STS_OK, blocks << 9);
} else { } 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; return req_pending;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment