diff options
Diffstat (limited to 'drivers/mtd/nand/omap2.c')
-rw-r--r-- | drivers/mtd/nand/omap2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index ab56069fa31f..05d3562ec748 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c | |||
@@ -881,7 +881,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) | |||
881 | struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, | 881 | struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, |
882 | mtd); | 882 | mtd); |
883 | unsigned long timeo = jiffies; | 883 | unsigned long timeo = jiffies; |
884 | int status = NAND_STATUS_FAIL, state = this->state; | 884 | int status, state = this->state; |
885 | 885 | ||
886 | if (state == FL_ERASING) | 886 | if (state == FL_ERASING) |
887 | timeo += (HZ * 400) / 1000; | 887 | timeo += (HZ * 400) / 1000; |
@@ -896,6 +896,8 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) | |||
896 | break; | 896 | break; |
897 | cond_resched(); | 897 | cond_resched(); |
898 | } | 898 | } |
899 | |||
900 | status = gpmc_nand_read(info->gpmc_cs, GPMC_NAND_DATA); | ||
899 | return status; | 901 | return status; |
900 | } | 902 | } |
901 | 903 | ||