1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index ce38960cca12..5914263090fc 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -171,11 +171,7 @@ static struct mmc_blk_data *mmc_blk_get(struct gendisk *disk)
 
 static inline int mmc_get_devidx(struct gendisk *disk)
 {
-        int devmaj = MAJOR(disk_devt(disk));
-        int devidx = MINOR(disk_devt(disk)) / perdev_minors;
-
-        if (!devmaj)
-                devidx = disk->first_minor / perdev_minors;
+        int devidx = disk->first_minor / perdev_minors;
         return devidx;
 }
 
@@ -2244,6 +2240,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
         md->disk->queue = md->queue.queue;
         md->disk->driverfs_dev = parent;
         set_disk_ro(md->disk, md->read_only || default_ro);
+        md->disk->flags = GENHD_FL_EXT_DEVT;
         if (area_type & (MMC_BLK_DATA_AREA_RPMB | MMC_BLK_DATA_AREA_BOOT))
                 md->disk->flags |= GENHD_FL_NO_PART_SCAN;