summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/omap2.c
diff options
context:
space:
mode:
authorToan Pham <tpham3783@gmail.com>2013-03-15 10:44:59 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2013-04-05 13:22:30 +0100
commit4ff6772b5bb17ef40e64abf2c0d5f6aefd104b06 (patch)
tree11fd833b24d3370b75571f658910d9b8a4a1afc8 /drivers/mtd/nand/omap2.c
parent0c4a235cb3c6464fd1886101fa9a1be933e340dd (diff)
downloadop-kernel-dev-4ff6772b5bb17ef40e64abf2c0d5f6aefd104b06.zip
op-kernel-dev-4ff6772b5bb17ef40e64abf2c0d5f6aefd104b06.tar.gz
mtd: omap2: use msecs_to_jiffies()
Fix mtd-utils from returning -EIO. Formatting jffs2 filesystem was impossible when CONFIG_HZ was set to a low value. Signed-off-by: Toan Pham <tpham3783@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/omap2.c')
-rw-r--r--drivers/mtd/nand/omap2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index b97ef3b..81b80af 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1023,9 +1023,9 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
int status, state = this->state;
if (state == FL_ERASING)
- timeo += (HZ * 400) / 1000;
+ timeo += msecs_to_jiffies(400);
else
- timeo += (HZ * 20) / 1000;
+ timeo += msecs_to_jiffies(20);
writeb(NAND_CMD_STATUS & 0xFF, info->reg.gpmc_nand_command);
while (time_before(jiffies, timeo)) {
OpenPOWER on IntegriCloud