2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 59ab0692f0b9..a9830ff8e3f3 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -349,7 +349,7 @@ static int legacy_set_geometry(struct gpmi_nand_data *this)
 
 int common_nfc_set_geometry(struct gpmi_nand_data *this)
 {
-        return set_geometry_by_ecc_info(this) ? 0 : legacy_set_geometry(this);
+        return legacy_set_geometry(this);
 }
 
 struct dma_chan *get_dma_chan(struct gpmi_nand_data *this)
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index dd03dfdfb0d6..c28d4e29af1a 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1320,7 +1320,12 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
         for (cs = 0; cs < pdata->num_cs; cs++) {
                 struct mtd_info *mtd = info->host[cs]->mtd;
 
-                mtd->name = pdev->name;
+                /*
+                 * The mtd name matches the one used in 'mtdparts' kernel
+                 * parameter. This name cannot be changed or otherwise
+                 * user's mtd partitions configuration would get broken.
+                 */
+                mtd->name = "pxa3xx_nand-0";
                 info->cs = cs;
                 ret = pxa3xx_nand_scan(mtd);
                 if (ret) {