Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (63 commits)
  mtd: OneNAND: Allow setting of boundary information when built as module
  jffs2: leaking jffs2_summary in function jffs2_scan_medium
  mtd: nand: Fix memory leak on txx9ndfmc probe failure.
  mtd: orion_nand: use burst reads with double word accesses
  mtd/nand: s3c6400 support for s3c2410 driver
  [MTD] [NAND] S3C2410: Use DIV_ROUND_UP
  [MTD] [NAND] S3C2410: Deal with unaligned lengths in S3C2440 buffer read/write
  [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND
  [MTD] [NAND] S3C2410: Added a kerneldoc for s3c2410_nand_set
  mtd: physmap_of: Add multiple regions and concatenation support
  mtd: nand: max_retries off by one in mxc_nand
  mtd: nand: s3c2410_nand_setrate(): use correct macros for 2412/2440
  mtd: onenand: add bbt_wait & unlock_all as replaceable for some platform
  mtd: Flex-OneNAND support
  mtd: nand: add OMAP2/OMAP3 NAND driver
  mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs
  mtd: uclinux: mark local stuff static
  mtd: uclinux: do not allow to be built as a module
  mtd: uclinux: allow systems to override map addr/size
  mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs
  ...

1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 29675edb44b4..349fcbe5cc0f 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -27,9 +27,7 @@ struct mtd_part {
         struct mtd_info mtd;
         struct mtd_info *master;
         uint64_t offset;
-        int index;
         struct list_head list;
-        int registered;
 };
 
 /*
@@ -321,8 +319,7 @@ int del_mtd_partitions(struct mtd_info *master)
         list_for_each_entry_safe(slave, next, &mtd_partitions, list)
                 if (slave->master == master) {
                         list_del(&slave->list);
-                        if (slave->registered)
-                                del_mtd_device(&slave->mtd);
+                        del_mtd_device(&slave->mtd);
                         kfree(slave);
                 }
 
@@ -395,7 +392,7 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
                 slave->mtd.get_fact_prot_info = part_get_fact_prot_info;
         if (master->sync)
                 slave->mtd.sync = part_sync;
-        if (!partno && master->suspend && master->resume) {
+        if (!partno && !master->dev.class && master->suspend && master->resume) {
                         slave->mtd.suspend = part_suspend;
                         slave->mtd.resume = part_resume;
         }
@@ -412,7 +409,6 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
         slave->mtd.erase = part_erase;
         slave->master = master;
         slave->offset = part->offset;
-        slave->index = partno;
 
         if (slave->offset == MTDPART_OFS_APPEND)
                 slave->offset = cur_offset;
@@ -500,15 +496,9 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
         }
 
 out_register:
-        if (part->mtdp) {
-                /* store the object pointer (caller may or may not register it*/
-                *part->mtdp = &slave->mtd;
-                slave->registered = 0;
-        } else {
-                /* register our partition */
-                add_mtd_device(&slave->mtd);
-                slave->registered = 1;
-        }
+        /* register our partition */
+        add_mtd_device(&slave->mtd);
+
         return slave;
 }