diff options
author | Adrian Hunter <adrian.hunter@intel.com> | 2016-11-29 12:09:08 +0200 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-12-05 10:30:34 +0100 |
commit | 5dd784d2e4eb765ae86b3366484d01429bb7adca (patch) | |
tree | ff95bdbf5469eb4e776ce2e10a85a69f0428e56b /drivers/mmc | |
parent | 34c1c21e94ac11e4332028b845c331f7171dde64 (diff) | |
download | op-kernel-dev-5dd784d2e4eb765ae86b3366484d01429bb7adca.zip op-kernel-dev-5dd784d2e4eb765ae86b3366484d01429bb7adca.tar.gz |
mmc: block: Restore line inadvertently removed with packed commands
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/card/block.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 86ff28f..19597e3 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1587,6 +1587,8 @@ static int mmc_blk_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, if (blocks != (u32)-1) { ret = blk_end_request(req, 0, blocks << 9); } + } else { + ret = blk_end_request(req, 0, brq->data.bytes_xfered); } return ret; } |