diff options
| author |   Shashi Rao <shashi@sun.com> | 2007-03-28 15:56:28 -0700 |
|---|---|---|
| committer |   David Woodhouse <dwmw2@infradead.org> | 2007-04-17 14:11:20 -0400 |
| commit | e6be133b68ae2c8f89d46da25ed7b31b84793e7e (patch) | |
| tree | 78ae9a2f10daa5e21c1761039146dffad1377a09 /drivers | |
| parent | [JFFS2] Speed up mount for directly-mapped NOR flash (diff) | |
| download | linux-dev-e6be133b68ae2c8f89d46da25ed7b31b84793e7e.tar.xz linux-dev-e6be133b68ae2c8f89d46da25ed7b31b84793e7e.zip | |
[MTD] Fix fwh_lock locking
This is on a custom board with a mapping driver access to an ST
M50LPW080 chip. This chip is probed successfully with
do_map_probe("jedec_probe",...). If I use the mtdchar interface to
perform unlock->erase->program->lock on any of the 16 eraseblocks in the
chip, the chip is left in FL_STATUS mode while the data structures
believe that the chip is in FL_READY mode. Hence, any subsequent reads
to any flash byte results in 0x80 being read.
Signed-off-by: Shashi Rao <shashi@sun.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/chips/fwh_lock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/chips/fwh_lock.h b/drivers/mtd/chips/fwh_lock.h index 77303ce5dcf1..ab44f2b996f8 100644 --- a/drivers/mtd/chips/fwh_lock.h +++ b/drivers/mtd/chips/fwh_lock.h @@ -65,11 +65,12 @@ static int fwh_xxlock_oneblock(struct map_info *map, struct flchip *chip, return ret; } + chip->oldstate = chip->state; chip->state = xxlt->state; map_write(map, CMD(xxlt->val), adr); /* Done and happy. */ - chip->state = FL_READY; + chip->state = chip->oldstate; put_chip(map, chip, adr); spin_unlock(chip->mutex); return 0; |