diff options
-rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index cb5a05e01531..ba6940d1d3d1 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c | |||
@@ -717,19 +717,8 @@ syndrome_done: | |||
717 | static const char *probes[] __initconst = | 717 | static const char *probes[] __initconst = |
718 | { "cmdlinepart", NULL }; | 718 | { "cmdlinepart", NULL }; |
719 | 719 | ||
720 | const char *master_name; | ||
721 | |||
722 | /* Set info->mtd.name = 0 temporarily */ | ||
723 | master_name = info->mtd.name; | ||
724 | info->mtd.name = (char *)0; | ||
725 | |||
726 | /* info->mtd.name == 0, means: don't bother checking | ||
727 | <mtd-id> */ | ||
728 | mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes, | 720 | mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes, |
729 | &mtd_parts, 0); | 721 | &mtd_parts, 0); |
730 | |||
731 | /* Restore info->mtd.name */ | ||
732 | info->mtd.name = master_name; | ||
733 | } | 722 | } |
734 | 723 | ||
735 | if (mtd_parts_nb <= 0) { | 724 | if (mtd_parts_nb <= 0) { |