Merge tag 'mfd-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 54f1f0d381f4d28c7b4d07d4044e4f0f7d2ddb05..26b31fcae217fd3d936ccb32c6d7847ff5654805 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -695,6 +695,15 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
        dev_t devt;
        int retval;
 
+       /*
+        * The disk queue should now be all set with enough information about
+        * the device for the elevator code to pick an adequate default
+        * elevator if one is needed, that is, for devices requesting queue
+        * registration.
+        */
+       if (register_queue)
+               elevator_init_mq(disk->queue);
+
        /* minors == 0 indicates to use ext devt from part0 and should
         * be accompanied with EXT_DEVT flag.  Make sure all
         * parameters make sense.