]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mmc: block: Restore line inadvertently removed with packed commands
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 29 Nov 2016 10:09:08 +0000 (12:09 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 5 Dec 2016 09:30:34 +0000 (10:30 +0100)
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>
drivers/mmc/card/block.c

index 86ff28f84698c918eb40d7517813024f879ebcf5..19597e3cefcb08ebda9ac1b524dc03358789151b 100644 (file)
@@ -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;
 }