diff options
Diffstat (limited to 'drivers/mtd/mtdcore.c')
-rw-r--r-- | drivers/mtd/mtdcore.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 13267477e4e9..e18639980f7a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
@@ -457,7 +457,7 @@ EXPORT_SYMBOL_GPL(mtd_device_register); | |||
457 | * @mtd: the MTD device to register | 457 | * @mtd: the MTD device to register |
458 | * @types: the list of MTD partition probes to try, see | 458 | * @types: the list of MTD partition probes to try, see |
459 | * 'parse_mtd_partitions()' for more information | 459 | * 'parse_mtd_partitions()' for more information |
460 | * @origin: start address of MTD device, %0 unless you are sure you need this. | 460 | * @parser_data: MTD partition parser-specific data |
461 | * @parts: fallback partition information to register, if parsing fails; | 461 | * @parts: fallback partition information to register, if parsing fails; |
462 | * only valid if %nr_parts > %0 | 462 | * only valid if %nr_parts > %0 |
463 | * @nr_parts: the number of partitions in parts, if zero then the full | 463 | * @nr_parts: the number of partitions in parts, if zero then the full |
@@ -480,14 +480,14 @@ EXPORT_SYMBOL_GPL(mtd_device_register); | |||
480 | * Returns zero in case of success and a negative error code in case of failure. | 480 | * Returns zero in case of success and a negative error code in case of failure. |
481 | */ | 481 | */ |
482 | int mtd_device_parse_register(struct mtd_info *mtd, const char **types, | 482 | int mtd_device_parse_register(struct mtd_info *mtd, const char **types, |
483 | unsigned long origin, | 483 | struct mtd_part_parser_data *parser_data, |
484 | const struct mtd_partition *parts, | 484 | const struct mtd_partition *parts, |
485 | int nr_parts) | 485 | int nr_parts) |
486 | { | 486 | { |
487 | int err; | 487 | int err; |
488 | struct mtd_partition *real_parts; | 488 | struct mtd_partition *real_parts; |
489 | 489 | ||
490 | err = parse_mtd_partitions(mtd, types, &real_parts, origin); | 490 | err = parse_mtd_partitions(mtd, types, &real_parts, parser_data); |
491 | if (err <= 0 && nr_parts) { | 491 | if (err <= 0 && nr_parts) { |
492 | real_parts = kmemdup(parts, sizeof(*parts) * nr_parts, | 492 | real_parts = kmemdup(parts, sizeof(*parts) * nr_parts, |
493 | GFP_KERNEL); | 493 | GFP_KERNEL); |