diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2017-08-30 15:10:08 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2017-08-30 15:10:08 +0200 |
| commit | 689dc7eb2ca2bd89872ef1510ff912cf31815811 (patch) | |
| tree | aa1e2bdc86b81d6f28e8e71d808d63b3959ffb62 /drivers/mmc/core | |
| parent | mmc: core: Move mmc_start_areq() declaration (diff) | |
| parent | mmc: sdhci-xenon: add set_power callback (diff) | |
| download | linux-689dc7eb2ca2bd89872ef1510ff912cf31815811.tar.xz linux-689dc7eb2ca2bd89872ef1510ff912cf31815811.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/block.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index b95c3b0094fd..29fc1e662891 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1223,7 +1223,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) @@ -1728,9 +1728,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; } |