Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[mv-sheeva.git] / drivers / mtd / nand / bcm_umi_nand.c

diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c
index 64c9cbaf86a1905abdb8b8663740af687b883db3..6908cdde3065e73b24509e8c9d32865f5befb1d9 100644 (file)
--- a/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@ -475,6 +475,14 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
                        largepage_bbt.options = NAND_BBT_SCAN2NDPAGE;
                this->badblock_pattern = &largepage_bbt;
        }
+
+       /*
+        * FIXME: ecc strength value of 6 bits per 512 bytes of data is a
+        * conservative guess, given 13 ecc bytes and using bch alg.
+        * (Assume Galois field order m=15 to allow a margin of error.)
+        */
+       this->ecc.strength = 6;
+
 #endif
 
        /* Now finish off the scan, now that ecc.layout has been initialized. */
@@ -487,7 +495,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
 
        /* Register the partitions */
        board_mtd->name = "bcm_umi-nand";
-       mtd_device_parse_register(board_mtd, NULL, 0, NULL, 0);
+       mtd_device_parse_register(board_mtd, NULL, NULL, NULL, 0);
 
        /* Return happy */
        return 0;