From: Robert Jarzmik <robert.jarzmik@free.fr>
Date: Thu, 22 Mar 2012 20:00:51 +0000 (+0100)
Subject: mtd: docg3 increase write/erase timeout
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2b3d284ed65b9ada18fd2ffb66daffe9c0ff168;p=linux-beck.git

mtd: docg3 increase write/erase timeout

After several tries with ubifs, it appears empirically that constructor
provided figures for erase/write timeouts are underestimated. A timeout
of 100ms seems to work with a 5 years worn chip, and no timeouts occur
anymore.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 62e01113c317..be88eb6217cb 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/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;