From: Adrian Hunter <adrian.hunter@intel.com>
Date: Tue, 29 Nov 2016 10:09:08 +0000 (+0200)
Subject: mmc: block: Restore line inadvertently removed with packed commands
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5dd784d2e4eb765ae86b3366484d01429bb7adca;p=linux-beck.git

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>
---

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;
 }