Merge branch 'linus' into cpus4096

[linux-2.6] / drivers / mtd / nand / s3c2410.c

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index ccacc40e64ee38d7b32250b88e24e78a85750461..b34a460ab67915afe3812d6ced1410cfff6c16b7 100644 (file)
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -675,6 +675,9 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
 
        if (set->ecc_layout != NULL)
                chip->ecc.layout = set->ecc_layout;
+
+       if (set->disable_ecc)
+               chip->ecc.mode  = NAND_ECC_NONE;
 }
 
 /* s3c2410_nand_update_chip