1 files changed, 4 insertions, 2 deletions

diff --git a/block/genhd.c b/block/genhd.c
index 59a2db6fecef..315afd2f2088 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -541,13 +541,15 @@ void add_disk(struct gendisk *disk)
         disk->major = MAJOR(devt);
         disk->first_minor = MINOR(devt);
 
+        /* Register BDI before referencing it from bdev */
+        bdi = &disk->queue->backing_dev_info;
+        bdi_register_dev(bdi, disk_devt(disk));
+
         blk_register_region(disk_devt(disk), disk->minors, NULL,
                             exact_match, exact_lock, disk);
         register_disk(disk);
         blk_register_queue(disk);
 
-        bdi = &disk->queue->backing_dev_info;
-        bdi_register_dev(bdi, disk_devt(disk));
         retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,
                                    "bdi");
         WARN_ON(retval);