Patchwork drivers/mtd/chips/cfi_cmdset_0001.c: correct block lock timeout

login
register
mail settings
Submitter Andrew Klossner
Date March 24, 2009, 6:14 p.m.
Message ID <200903241814.n2OIEdBZ026558@pogo.cesa.opbu.xerox.com>
Download mbox | patch
Permalink /patch/25024/
State New, archived
Headers show

Comments

Andrew Klossner - March 24, 2009, 6:14 p.m.
The time parameters to WAIT_TIMEOUT are in units of microseconds, so
one second must be expressed as 1000000 not 1000000/HZ.

The Intel Strataflash part with which this patch was tested takes 0.7
seconds to lock/unlock, so one second does indeed seem to be a good
timeout value.

Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
---

Patch

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index f5ab6fa..97f3c71 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -2041,7 +2041,7 @@  static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip
 	 * If Instant Individual Block Locking supported then no need
 	 * to delay.
 	 */
-	udelay = (!extp || !(extp->FeatureSupport & (1 << 5))) ? 1000000/HZ : 0;
+	udelay = (!extp || !(extp->FeatureSupport & (1 << 5))) ? 1000000 : 0;
 
 	ret = WAIT_TIMEOUT(map, chip, adr, udelay, udelay * 100);
 	if (ret) {