diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-12-10 11:52:34 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-12-10 11:52:34 -0700 |
| commit | 5eff363838654790f67f4bd564c5782967f67bcc (patch) | |
| tree | f94e0991bee2a7aecd23556e137c08260de62c8a | |
| parent | e6a59aac8a8713f335a37d762db0dbe80e7f6d38 (diff) | |
| download | linux-misc-5eff363838654790f67f4bd564c5782967f67bcc.tar.gz | |
Revert "mtd_blkdevs: don't scan partitions for plain mtdblock"
This reverts commit 776b54e97a7d993ba23696e032426d5dea5bbe70.
Looks like a last minute edit snuck into this patch, and as a result,
it doesn't even compile. Revert the change for now.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/mtd/mtd_blkdevs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index a69d064a8eec9b..4eaba6f4ec680a 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -346,7 +346,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) gd->minors = 1 << tr->part_bits; gd->fops = &mtd_block_ops; - if (tr->part_bits) { + if (tr->part_bits) if (new->devnum < 26) snprintf(gd->disk_name, sizeof(gd->disk_name), "%s%c", tr->name, 'a' + new->devnum); @@ -355,11 +355,9 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) "%s%c%c", tr->name, 'a' - 1 + new->devnum / 26, 'a' + new->devnum % 26); - } else { + else snprintf(gd->disk_name, sizeof(gd->disk_name), "%s%d", tr->name, new->devnum); - gd->flags |= GENHD_FL_NO_PART; - } set_capacity(gd, ((u64)new->size * tr->blksize) >> 9); |