From patchwork Fri Mar 6 03:32:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: mtd: CFI: fix bug - bonnie++ error on BF548 NOR flash Date: Thu, 05 Mar 2009 17:32:18 -0000 From: Bryan Wu X-Patchwork-Id: 24141 Message-Id: <1236310338-24256-1-git-send-email-cooloney@kernel.org> To: dwmw2@infradead.org Cc: Graf Yang , Bryan Wu , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org From: Graf Yang The function inval_cache_and_wait_for_operation() is called both by write and erase operation. If erase call it and stayed there, then write call it and male-cleared chip->erase_suspended, the time out error may arise. Signed-off-by: Graf Yang Signed-off-by: Bryan Wu --- drivers/mtd/chips/cfi_cmdset_0001.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index f5ab6fa..c151075 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -1236,10 +1236,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 has occured while sleep: reset timeout */ timeo = reset_timeo; chip->erase_suspended = 0; + } + if (chip->write_suspended && chip_state == FL_WRITING) { + /* Write suspend has occured while sleep: reset timeout */ + timeo = reset_timeo; chip->write_suspended = 0; } }