From: Nicolas Pitre Date: Wed, 29 Mar 2006 22:31:42 +0000 (+0100) Subject: cfi-cmdset-0001: always update the chip status X-Git-Tag: v2.6.18-rc1~1105^2~92 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6e7a6809c555aeb7cb98544df4d446fbd6f123ec;p=linux-2.6-omap-h63xx.git cfi-cmdset-0001: always update the chip status ... otherwise xip_enable() won't do the right thing. Signed-off-by: Nicolas Pitre Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index e797752f7c0..ab3888f5e46 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/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);