| Message ID | 1278996990-4380-1-git-send-email-conke@maxwit.com |
|---|---|
| State | Accepted |
| Commit | 78d1022439e501bc4a1a32bfaad5a321b8a9d5d6 |
| Headers | show |
On Tue, 2010-07-13 at 12:56 +0800, Conke Hu wrote: > 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: Conke Hu <conke@maxwit.com> Pushed to l2-mtd-2.6.git / master, thanks.
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 239aadf..33d832d 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c @@ -727,15 +727,12 @@ 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 = set->nr_partitions; - part_info = set->partitions; - } + mtd->mtd.name = set->name; + 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)
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: Conke Hu <conke@maxwit.com> --- drivers/mtd/nand/s3c2410.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-)