From patchwork Tue Mar 24 18:14:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: drivers/mtd/chips/cfi_cmdset_0001.c: correct block lock timeout From: Andrew Klossner X-Patchwork-Id: 25024 Message-Id: <200903241814.n2OIEdBZ026558@pogo.cesa.opbu.xerox.com> To: linux-mtd@lists.infradead.org Date: Tue, 24 Mar 2009 11:14:39 -0700 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 --- 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) {