Merge branch 'for-linus' into for-3.18/core

[firefly-linux-kernel-4.4.55.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 81744617548955b84b6c912b3ab270c65674d274..6946a4275e6ff2e689de8b60dff18e7999fb3f80 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1248,7 +1248,6 @@ void blk_rq_set_block_pc(struct request *rq)
        rq->__sector = (sector_t) -1;
        rq->bio = rq->biotail = NULL;
        memset(rq->__cmd, 0, sizeof(rq->__cmd));
-       rq->cmd = rq->__cmd;
 }
 EXPORT_SYMBOL(blk_rq_set_block_pc);