Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into...

[pandora-kernel.git] / block / blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 521ae90..1fac434 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);