Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d10224 authored by Conke Hu's avatar Conke Hu Committed by David Woodhouse
Browse files

mtd: s3c nand: parsing command-line partitions prior to set->partitions 



Current driver prevents command-line partitions from being parsed when built-in
partitions are defined in s3c2410_nand_set object, but it is not desirable in some
cases. This patch tries to parse commad-line partitions prior to the built-in.

Signed-off-by: default avatarConke Hu <conke@maxwit.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 6a8cfcfb

drivers/mtd/nand/s3c2410.c

+6 −9
Original line number Diff line number Diff line
@@ -727,16 +727,13 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info, 
	if (set == NULL)

		return add_mtd_device(&mtd->mtd);



	if (set->nr_partitions == 0) {

	mtd->mtd.name = set->name;

		nr_part = parse_mtd_partitions(&mtd->mtd, part_probes,

						&part_info, 0);

	} else {

		if (set->nr_partitions > 0 && set->partitions != NULL) {

	nr_part = parse_mtd_partitions(&mtd->mtd, part_probes, &part_info, 0);



	if (nr_part <= 0 && set->nr_partitions > 0) {

		nr_part = set->nr_partitions;

		part_info = set->partitions;

	}

	}



	if (nr_part > 0 && part_info)

		return add_mtd_partitions(&mtd->mtd, part_info, nr_part);