From 78cf99b027dc507283c7a3d01cf4d10bdefeb848 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Wed, 29 Mar 2006 23:31:42 +0100
Subject: [PATCH] --- yaml --- r: 27791 b: refs/heads/master c:
 6e7a6809c555aeb7cb98544df4d446fbd6f123ec h: refs/heads/master i:   27789:
 f822252ab40394a8bb5fc1ff7f69c50c6a1c2f0b   27787:
 7de21262c08b5a70a2f2009e058062d847c8a203   27783:
 ce79053bc98b6de857f71fef9c70f76b911a16b7   27775:
 c068fc7409f3fb1a533ac3dc34f56643911e5f07 v: v3

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

diff --git a/[refs] b/[refs]
index 81c5f10c200e..5a5642541fb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df54b52c411befdcf1d0989f939a49163570ad29
+refs/heads/master: 6e7a6809c555aeb7cb98544df4d446fbd6f123ec
diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
index e797752f7c0b..ab3888f5e464 100644
--- a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1479,8 +1479,10 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
 	   [...], the device will not accept any more Write to Buffer commands".
 	   So we must check here and reset those bits if they're set. Otherwise
 	   we're just pissing in the wind */
-	if (chip->state != FL_STATUS)
+	if (chip->state != FL_STATUS) {
 		map_write(map, CMD(0x70), cmd_adr);
+		chip->state = FL_STATUS;
+	}
 	status = map_read(map, cmd_adr);
 	if (map_word_bitsset(map, status, CMD(0x30))) {
 		xip_enable(map, chip, cmd_adr);