From ad5d21fa5b100a2af04cc12fe97088661439761f Mon Sep 17 00:00:00 2001
From: Robert Jarzmik <robert.jarzmik@free.fr>
Date: Thu, 22 Mar 2012 21:00:51 +0100
Subject: [PATCH] --- yaml --- r: 298191 b: refs/heads/master c:
 a2b3d284ed65b9ada18fd2ffb66daffe9c0ff168 h: refs/heads/master i:   298189:
 4ac71fb9faf6a016c0d4d7852ff888ae15cce77b   298187:
 9f885df3b905d6f638617c538093c347a14e5deb   298183:
 5b4e5a4cc8be4a80e2a69420fbd123800d511a97   298175:
 6120309d40a3d8cb18186dd6c9f2dd00af515a4e v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mtd/devices/docg3.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 12011668a844..6a629cc69ffa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7baef1211b0ac218299965481e7cff9d68c1edd
+refs/heads/master: a2b3d284ed65b9ada18fd2ffb66daffe9c0ff168
diff --git a/trunk/drivers/mtd/devices/docg3.c b/trunk/drivers/mtd/devices/docg3.c
index 62e01113c317..be88eb6217cb 100644
--- a/trunk/drivers/mtd/devices/docg3.c
+++ b/trunk/drivers/mtd/devices/docg3.c
@@ -1116,10 +1116,10 @@ static int doc_get_op_status(struct docg3 *docg3)
  */
 static int doc_write_erase_wait_status(struct docg3 *docg3)
 {
-	int status, ret = 0;
+	int i, status, ret = 0;
 
-	if (!doc_is_ready(docg3))
-		usleep_range(3000, 3000);
+	for (i = 0; !doc_is_ready(docg3) && i < 5; i++)
+		msleep(20);
 	if (!doc_is_ready(docg3)) {
 		doc_dbg("Timeout reached and the chip is still not ready\n");
 		ret = -EAGAIN;