diff options
author | Colin Cross <ccross@android.com> | 2010-09-03 12:41:21 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:35 -0700 |
commit | fa746fabf17fdcf93450ba16bf831a8faf54e692 (patch) | |
tree | b3f8d60f51697210df8e65c10a2d528af2f88459 /drivers/mmc/card | |
parent | fa92a3d6959546baa27e892188d3e9bb79c31741 (diff) | |
download | kernel_samsung_crespo-fa746fabf17fdcf93450ba16bf831a8faf54e692.zip kernel_samsung_crespo-fa746fabf17fdcf93450ba16bf831a8faf54e692.tar.gz kernel_samsung_crespo-fa746fabf17fdcf93450ba16bf831a8faf54e692.tar.bz2 |
mmc_block: Allow more than 8 partitions per card
Set the GENHD_FL_EXT_DEVT flag, which will allocate minor numbers
in major 259 for partitions past disk->minors.
Also remove the use of disk_devt to determine devidx from md->disk.
md->disk->first_minor is always initialized from devidx and can
always be used to recover it.
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'drivers/mmc/card')
-rw-r--r-- | drivers/mmc/card/block.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index f0bc6aa..ac13768 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -126,11 +126,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; } @@ -1050,6 +1046,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; /* * As discussed on lkml, GENHD_FL_REMOVABLE should: |