Commit 5eff3638 authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "mtd_blkdevs: don't scan partitions for plain mtdblock" 



This reverts commit 776b54e9.

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: default avatarJens Axboe <axboe@kernel.dk>
parent e6a59aac

drivers/mtd/mtd_blkdevs.c

+2 −4
Original line number Diff line number Diff line
@@ -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);