summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2016-11-29 13:09:08 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2016-12-05 12:30:34 +0300
commit5dd784d2e4eb765ae86b3366484d01429bb7adca (patch)
treeff95bdbf5469eb4e776ce2e10a85a69f0428e56b /drivers/mmc
parent34c1c21e94ac11e4332028b845c331f7171dde64 (diff)
downloadlinux-5dd784d2e4eb765ae86b3366484d01429bb7adca.tar.xz
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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 86ff28f84698..19597e3cefcb 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;
}