From: Linus Walleij Date: Tue, 24 Jan 2017 10:17:54 +0000 (+0100) Subject: mmc: block: do not assign mq_rq when aborting command X-Git-Tag: v4.11-rc1~140^2~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fb85d658308952142da6abb4e066dd22dd48c01;p=thirdparty%2Fkernel%2Flinux.git mmc: block: do not assign mq_rq when aborting command The code in mmc_blk_issue_rq_rq() aborts a command if the request is not properly aligned on large sectors. As part of the path jumping out, it assigns the local variable mq_rq reflecting a MMC queue request to the current MMC queue request, which is confusing since the variable is not used after this jump. Signed-off-by: Linus Walleij Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index b60d1fb3a07ae..13e6fe060f26b 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1649,7 +1649,6 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) !IS_ALIGNED(blk_rq_sectors(rqc), 8)) { pr_err("%s: Transfer size is not 4KB sector size aligned\n", rqc->rq_disk->disk_name); - mq_rq = mq->mqrq_cur; req = rqc; rqc = NULL; goto cmd_abort;