diff options
| author | Colin Cross <ccross@android.com> | 2010-09-03 12:41:21 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-03-30 11:24:23 -0700 |
| commit | 0c6ec7494c376d2ea622787053053894e4cc6ad5 (patch) | |
| tree | 1f1db4a095af9238bc5c6f07470c3f12308f51aa | |
| parent | b4a9bb2769286033e4eb5d164f959aae5088bab3 (diff) | |
| download | experimental-0c6ec7494c376d2ea622787053053894e4cc6ad5.tar.gz | |
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>
| -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 14b8739832f..a47adec03b5 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -102,11 +102,7 @@ static void mmc_blk_put(struct mmc_blk_data *md) mutex_lock(&open_lock); md->usage--; if (md->usage == 0) { - int devmaj = MAJOR(disk_devt(md->disk)); - int devidx = MINOR(disk_devt(md->disk)) / perdev_minors; - - if (!devmaj) - devidx = md->disk->first_minor / perdev_minors; + int devidx = md->disk->first_minor / perdev_minors; blk_cleanup_queue(md->queue.queue); @@ -636,6 +632,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) md->disk->private_data = md; md->disk->queue = md->queue.queue; md->disk->driverfs_dev = &card->dev; + md->disk->flags = GENHD_FL_EXT_DEVT; set_disk_ro(md->disk, md->read_only); /* |