colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] nand: Fix patch merge problem

Browse Source 
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese
2006-11-28 11:04:45 +01:00
parent d2c83f5493
commit e7f3e9ff01
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nand/nand_base.c
View File

@@ -838,9 +838,9 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
unsigned long timeo; unsigned long timeo;
if (state == FL_ERASING) if (state == FL_ERASING)
timeo += (HZ * 400) / 1000; timeo = (CFG_HZ * 400) / 1000;
else else
timeo += (HZ * 20) / 1000; timeo = (CFG_HZ * 20) / 1000;
if ((state == FL_ERASING) && (this->options & NAND_IS_AND)) if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
this->cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1); this->cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1);