1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index e29c1da7f56e..85a7283845ff 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2469,8 +2469,12 @@ int nand_scan_tail(struct mtd_info *mtd)
                         chip->ecc.write_oob = nand_write_oob_std;
 
         case NAND_ECC_HW_SYNDROME:
-                if (!chip->ecc.calculate || !chip->ecc.correct ||
-                    !chip->ecc.hwctl) {
+                if ((!chip->ecc.calculate || !chip->ecc.correct ||
+                     !chip->ecc.hwctl) &&
+                    (!chip->ecc.read_page ||
+                     chip->ecc.read_page == nand_read_page_hwecc) ||
+                     !chip->ecc.write_page ||
+                     chip->ecc.write_page == nand_write_page_hwecc) {
                         printk(KERN_WARNING "No ECC functions supplied, "
                                "Hardware ECC not possible\n");
                         BUG();