summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-01-24 11:17:54 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2017-02-13 13:20:38 +0100
commit6fb85d658308952142da6abb4e066dd22dd48c01 (patch)
treec5432cd6304a3a0d49a632503edc06d64c96fc2d
parentefb5a05e70dfa79fe26133be9a239cbca8ea08c3 (diff)
downloadblackbird-op-linux-6fb85d658308952142da6abb4e066dd22dd48c01.tar.gz
blackbird-op-linux-6fb85d658308952142da6abb4e066dd22dd48c01.zip
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 <linus.walleij@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/core/block.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index b60d1fb3a07a..13e6fe060f26 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;
OpenPOWER on IntegriCloud