From 3c01f5abe4f43d6e08ea356d3cabbaa7a394ed73 Mon Sep 17 00:00:00 2001
From: Toan Pham <tpham3783@gmail.com>
Date: Fri, 15 Mar 2013 10:44:59 -0700
Subject: [PATCH] --- yaml --- r: 374783 b: refs/heads/master c:
 4ff6772b5bb17ef40e64abf2c0d5f6aefd104b06 h: refs/heads/master i:   374781:
 7f54924d9bf3fde3dc02d0406715e4143ff3b9c0   374779:
 5a1afd15631b265b2a42c9360ee97eb3bd58a112   374775:
 049285a901a00b9ade7f5e7932c39a786e7e2bba   374767:
 822dd04f3440f6c00a4d8777d118aace877cc03a   374751:
 553d8ab779af68a49c9eafea8c0895609645579b   374719:
 cba5ab6e8444bef4fe90273228839deb25e49ab8   374655:
 821bc6a37da7ad0ce1d5ae95e503a1967d2b6780   374527:
 b49bcd960e347de504db912afa22862cab53e789   374271:
 6e6a6ef0ed1fc9652e98fcd9990959fb73e94d80   373759:
 aff92e1d6f8b32509fe6b4ff7c165de325f62478   372735:
 7fc7431e986c8692dde174b9897d473a271adc76 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mtd/nand/omap2.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 65030f59fc69..b890ccb29b69 100644
--- 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
index b97ef3b68ec6..81b80af55872 100644
--- 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)) {