Patchwork [MTD,CHIPS] cfi_cmdset_0001.c: Fix a bug in inval_cache_and_wait_for_operation().

login
register
mail settings
Submitter graff.yang@gmail.com
Date March 2, 2009, 8:31 a.m.
Message ID <12359826893947-git-send-email-graff.yang@gmail.com>
Download mbox | patch
Permalink /patch/23928/
State Accepted
Commit 6ac15e92dfd3064ae484e2e823890622476c4356
Headers show

Comments

graff.yang@gmail.com - March 2, 2009, 8:31 a.m.
From: Graff Yang <graff.yang@gmail.com>

If the inval_cache_and_wait_for_operation() is re-entered by write operation when erase
operation is in progress, the chip->erase_suspended will be cleared, this cause the erase
timeo is not reset and will result time out error for erase.

Signed-off-by: Graff Yang <graff.yang@gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0001.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 5157e3c..a254fc3 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1223,10 +1223,14 @@  static int inval_cache_and_wait_for_operation(
 			remove_wait_queue(&chip->wq, &wait);
 			spin_lock(chip->mutex);
 		}
-		if (chip->erase_suspended || chip->write_suspended)  {
-			/* Suspend has occured while sleep: reset timeout */
+		if (chip->erase_suspended && chip_state == FL_ERASING)  {
+			/* Erase suspend occured while sleep: reset timeout */
 			timeo = reset_timeo;
 			chip->erase_suspended = 0;
+		}
+		if (chip->write_suspended && chip_state == FL_WRITING)  {
+			/* Write suspend occured while sleep: reset timeout */
+			timeo = reset_timeo;
 			chip->write_suspended = 0;
 		}
 	}