Merge remote-tracking branch 'block/for-next'

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

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 07b42f5ad797b7b5e6367d5c70051d3b34fca55c..31849e328b452a8fdd26d202a30edc86e6d451df 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -600,9 +600,8 @@ int blk_register_queue(struct gendisk *disk)
         */
        if (!blk_queue_init_done(q)) {
                queue_flag_set_unlocked(QUEUE_FLAG_INIT_DONE, q);
+               percpu_ref_switch_to_percpu(&q->q_usage_counter);
                blk_queue_bypass_end(q);
-               if (q->mq_ops)
-                       blk_mq_finish_init(q);
        }
 
        ret = blk_trace_init_sysfs(dev);