Merge tag 'fbdev-omap-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...

[karo-tx-linux.git] / block / blk-flush.c

diff --git a/block/blk-flush.c b/block/blk-flush.c
index ff87c664b7df63e62710faad323f8eae8fcd082c..8ffee4b5f93de9c2283f2f55684e3667b340c733 100644 (file)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -225,7 +225,7 @@ static void flush_end_io(struct request *flush_rq, int error)
 
        if (q->mq_ops) {
                spin_lock_irqsave(&q->mq_flush_lock, flags);
-               q->flush_rq->cmd_flags = 0;
+               q->flush_rq->tag = -1;
        }
 
        running = &q->flush_queue[q->flush_running_idx];