diff options
| author |   Brian Norris <computersforpeace@gmail.com> | 2016-06-24 10:38:14 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-07-09 19:29:38 -0700 |
| commit | 06586204714b7befec99e554c71687b0b40f351c (patch) | |
| tree | a9b3b4af144f225b85e44567eebe7342e6d095ff /drivers/mtd/spi-nor/spi-nor.c | |
| parent | mtd: cfi_cmdset_0020: Deinline do_write_buffer, save 5316 bytes (diff) | |
| download | linux-dev-06586204714b7befec99e554c71687b0b40f351c.tar.xz linux-dev-06586204714b7befec99e554c71687b0b40f351c.zip | |
mtd: spi-nor: fix wrong "fully unlocked" test
In stm_unlock(), the test to determine whether we've fully unlocked the
flash checks for the lock length to be equal to the flash size. That is
a typo/think-o -- the condition actually means the flash is completely
*locked.* We should be using the inverse condition -- that the lock
length is 0 (i.e., no protection).
The result of this bug is that we never actually turn off the Status
Register Write Disable bit, even if the flash is completely unlocked.
Now we can.
Fixes: 47b8edbf0d43 ("mtd: spi-nor: disallow further writes to SR if WP# is low")
Reported-by: Giorgio <giorgio.nicole@arcor.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Diffstat (limited to 'drivers/mtd/spi-nor/spi-nor.c')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index a63922ed6385..14cf6ac8c0a5 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -661,7 +661,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) status_new = (status_old & ~mask & ~SR_TB) | val; /* Don't protect status register if we're fully unlocked */ - if (lock_len == mtd->size) + if (lock_len == 0) status_new &= ~SR_SRWD; if (!use_top) |