2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index cc07ba0f044d..27fa8b87cd5f 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -240,6 +240,9 @@ static void nand_davinci_hwctl_4bit(struct mtd_info *mtd, int mode)
         unsigned long flags;
         u32 val;
 
+        /* Reset ECC hardware */
+        davinci_nand_readl(info, NAND_4BIT_ECC1_OFFSET);
+
         spin_lock_irqsave(&davinci_nand_lock, flags);
 
         /* Start 4-bit ECC calculation for read/write */
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index a59361c36f40..5513bfd9cdc9 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -2169,7 +2169,7 @@ scan_tail:
         return 0;
 
 return_error:
-        if (info->dma)
+        if (!IS_ERR_OR_NULL(info->dma))
                 dma_release_channel(info->dma);
         if (nand_chip->ecc.priv) {
                 nand_bch_free(nand_chip->ecc.priv);