Commit 6e7a6809 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by David Woodhouse
Browse files

cfi-cmdset-0001: always update the chip status 



... otherwise xip_enable() won't do the right thing.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent df54b52c

drivers/mtd/chips/cfi_cmdset_0001.c

+3 −1
Original line number Diff line number Diff line
@@ -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);