Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / mtd / nand / gpmi-nand / gpmi-nand.c

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 6e461560c6a8eff68f7b0698c73e332c8f6bf28a..6c062b8251d238ac8155c2a7590eaa2c9ffd2c42 100644 (file)
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -318,7 +318,8 @@ static int legacy_set_geometry(struct gpmi_nand_data *this)
                return -EINVAL;
        }
 
-       geo->page_size = mtd->writesize + mtd->oobsize;
+       geo->page_size = mtd->writesize + geo->metadata_size +
+               (geo->gf_len * geo->ecc_strength * geo->ecc_chunk_count) / 8;
        geo->payload_size = mtd->writesize;
 
        /*