From 368e4379858b4c05adeb9e5b13e509ad67874c0a Mon Sep 17 00:00:00 2001 From: Peter Horton Date: Fri, 8 May 2009 13:51:53 +0100 Subject: [PATCH] --- yaml --- r: 144743 b: refs/heads/master c: cd1a6de7d4a492bf3405a6c070075a4cb8c90262 h: refs/heads/master i: 144741: 336211a42135e386d8244ca0c83313e465be1257 144739: 623e655dcc6c1056155340562a18a3a8a8aed7d9 144735: 1b57bf3b98c0179d908f823141d9789ff2c78c67 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 12d7bad5fb39..fdf9acf5abdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f33b0aaac4e208579fe5aa2964857d4e9ba10c5 +refs/heads/master: cd1a6de7d4a492bf3405a6c070075a4cb8c90262 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index dfadef84c052..cc6369ea67dd 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -54,7 +54,7 @@ #define SR_SRWD 0x80 /* SR write protect */ /* Define max times to check status register before we give up. */ -#define MAX_READY_WAIT_COUNT 1000000 +#define MAX_READY_WAIT_JIFFIES (10 * HZ) /* eg. M25P128 specs 6s max sector erase */ #define CMD_SIZE 4 #ifdef CONFIG_M25PXX_USE_FAST_READ @@ -139,20 +139,20 @@ static inline int write_enable(struct m25p *flash) */ static int wait_till_ready(struct m25p *flash) { - int count; + unsigned long deadline; int sr; - /* one chip guarantees max 5 msec wait here after page writes, - * but potentially three seconds (!) after page erase. - */ - for (count = 0; count < MAX_READY_WAIT_COUNT; count++) { + deadline = jiffies + MAX_READY_WAIT_JIFFIES; + + do { if ((sr = read_sr(flash)) < 0) break; else if (!(sr & SR_WIP)) return 0; - /* REVISIT sometimes sleeping would be best */ - } + cond_resched(); + + } while (!time_after_eq(jiffies, deadline)); return 1; }