---

yaml --- r: 374783 b: refs/heads/master c: 4ff6772 h: refs/heads/master i: 374781: 7f54924 374779: 5a1afd1 374775: 049285a 374767: 822dd04 374751: 553d8ab 374719: cba5ab6 374655: 821bc6a 374527: b49bcd9 374271: 6e6a6ef 373759: aff92e1 372735: 7fc7431 v: v3
git-mirror · Apr 5, 2013 · 3c01f5a · 3c01f5a
1 parent dc137ff
commit 3c01f5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c4a235cb3c6464fd1886101fa9a1be933e340dd
+refs/heads/master: 4ff6772b5bb17ef40e64abf2c0d5f6aefd104b06
diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/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)) {