Merge tag 'v3.18-rockchip-cpufreqdev-v2' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 521ae9089c50c704af07d643cd7cf3729e259327..1fac43408911acc505daae163820a5abbe1f4e45 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -519,8 +519,8 @@ static void blk_release_queue(struct kobject *kobj)
 
        if (q->mq_ops)
                blk_mq_free_queue(q);
-
-       kfree(q->flush_rq);
+       else
+               blk_free_flush_queue(q->fq);
 
        blk_trace_shutdown(q);