1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 56b661972122..c41f45faa09e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -296,6 +296,7 @@ struct fsmc_nand_data {
 
         struct fsmc_eccplace    *ecc_place;
         unsigned int            bank;
+        struct device           *dev;
         struct clk              *clk;
 
         struct fsmc_nand_timings *dev_timings;
@@ -457,6 +458,11 @@ static int fsmc_read_hwecc_ecc4(struct mtd_info *mtd, const uint8_t *data,
                         cond_resched();
         } while (!time_after_eq(jiffies, deadline));
 
+        if (time_after_eq(jiffies, deadline)) {
+                dev_err(host->dev, "calculate ecc timed out\n");
+                return -ETIMEDOUT;
+        }
+
         ecc_tmp = readl(&regs->bank_regs[bank].ecc1);
         ecc[0] = (uint8_t) (ecc_tmp >> 0);
         ecc[1] = (uint8_t) (ecc_tmp >> 8);
@@ -793,6 +799,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
         host->select_chip = pdata->select_bank;
         host->partitions = pdata->partitions;
         host->nr_partitions = pdata->nr_partitions;
+        host->dev = &pdev->dev;
         host->dev_timings = pdata->nand_timings;
         regs = host->regs_va;