---

yaml --- r: 27791 b: refs/heads/master c: 6e7a680 h: refs/heads/master i: 27789: f822252 27787: 7de2126 27783: ce79053 27775: c068fc7 v: v3
git-mirror · May 17, 2006 · 78cf99b · 78cf99b
1 parent 88f0a28
commit 78cf99b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);