erase timeout

[Cliff Brake]

Using Intel Strataflash, I occasionally get the following error during linux
boot usually when remounting a jffs2 filesystem as r/w:

"waiting for erase to complete timed out."

making the following change seems to fix the problem:

=================================================
--- cfi_cmdset_0001.c	Thu May 17 15:23:17 2001
+++ cfi_cmdset_0001_cliff.c	Mon May 21 11:01:07 2001
@@ -1021,7 +1021,7 @@
 			spin_unlock_bh(chip->mutex);
 			schedule();
 			remove_wait_queue(&chip->wq, &wait);
-			timeo = jiffies + (HZ*2); /* FIXME */
+//			timeo = jiffies + (HZ*2); /* FIXME */
 			spin_lock_bh(chip->mutex);
 			continue;
 		}
=================================================

The Intel datasheet lists the block erase time maximum as 5sec and the
errata lists the maximum erase time as high as 25s for some parts.  Is the
above change correct?

Thanks,
Cliff