[MTD] NAND Fixup NDFC merge brokeness

[Linux-MTD Mailing List]

Commit:     b6d5ee00e397b20dc88f7ffaa6f7651b71996a5c
Parent:     ad3b5fb772e6a824f1ac341eb8e392eca6fc524f
commit b6d5ee00e397b20dc88f7ffaa6f7651b71996a5c
Author:     Thomas Gleixner <tglx at cruncher.tec.linutronix.de>
AuthorDate: Fri Jun 16 18:10:09 2006 +0200
Commit:     David Woodhouse <dwmw2 at infradead.org>
CommitDate: Tue Jun 20 20:31:23 2006 +0100

    [MTD] NAND Fixup NDFC merge brokeness
    
    Remove the remains of a broken merge.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---
 drivers/mtd/nand/ndfc.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 551702d..fe8d385 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -203,16 +203,11 @@ static int ndfc_chip_probe(struct platfo
 #ifdef CONFIG_MTD_PARTITIONS
 	printk("Number of partitions %d\n", nc->nr_partitions);
 	if (nc->nr_partitions) {
-		struct mtd_info *mtd_ubi;
-		nc->partitions[NAND_PARTS_CONTENT_IDX].mtdp = &mtd_ubi;
-
-		add_mtd_device(&nandmtd->mtd); /* for testing */
-		add_mtd_partitions(&nandmtd->mtd,
-				   nc->partitions,
+		/* Add the full device, so complete dumps can be made */
+		add_mtd_device(&nandmtd->mtd);
+		add_mtd_partitions(&nandmtd->mtd, nc->partitions,
 				   nc->nr_partitions);
 
-		add_mtd_device(mtd_ubi);
-
 	} else
 #else
 		add_mtd_device(&nandmtd->mtd);
@@ -233,7 +228,7 @@ static int ndfc_nand_probe(struct platfo
 	struct ndfc_controller_settings *settings = nc->priv;
 	struct resource *res = pdev->resource;
 	struct ndfc_controller *ndfc = &ndfc_ctrl;
-	unsigned long long phys = setting->erpn | res->start;
+	unsigned long long phys = settings->ndfc_erpn | res->start;
 
 	ndfc->ndfcbase = ioremap64(phys, res->end - res->start + 1);
 	if (!ndfc->ndfcbase) {