diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-01-05 16:04:40 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-01-05 16:05:56 -0800 |
| commit | e576330033936d94a00068760a5744e27ce51a32 (patch) | |
| tree | e91b17f2e0820e506a4a6c91afc921a3cea4cd63 /drivers/mtd/spi-nor | |
| parent | 887e9d3a1f3e93a1c64294649c0dd301035a7892 (diff) | |
| parent | a32d5b726ff8cf32bf491522b0ac8ae2545a063e (diff) | |
| download | linux-stable-e576330033936d94a00068760a5744e27ce51a32.tar.gz linux-stable-e576330033936d94a00068760a5744e27ce51a32.tar.bz2 linux-stable-e576330033936d94a00068760a5744e27ce51a32.zip | |
mtd: merge MTD development from v4.4 into for-v4.5 development
Small conflict between some bugfixes for 4.4 and some refactoring for
4.5.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/spi-nor')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 7e5051e604b0..f8f36d47575f 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -539,8 +539,8 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) return status_old; /* Cannot unlock; would unlock larger region than requested */ - if (stm_is_locked_sr(nor, status_old, ofs - mtd->erasesize, - mtd->erasesize)) + if (stm_is_locked_sr(nor, ofs - mtd->erasesize, mtd->erasesize, + status_old)) return -EINVAL; /* @@ -1225,8 +1225,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) if (JEDEC_MFR(info) == SNOR_MFR_ATMEL || JEDEC_MFR(info) == SNOR_MFR_INTEL || - JEDEC_MFR(info) == SNOR_MFR_SST || - JEDEC_MFR(info) == SNOR_MFR_WINBOND) { + JEDEC_MFR(info) == SNOR_MFR_SST) { write_enable(nor); write_sr(nor, 0); } @@ -1242,8 +1241,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) mtd->_read = spi_nor_read; /* NOR protection support for STmicro/Micron chips and similar */ - if (JEDEC_MFR(info) == SNOR_MFR_MICRON || - JEDEC_MFR(info) == SNOR_MFR_WINBOND) { + if (JEDEC_MFR(info) == SNOR_MFR_MICRON) { nor->flash_lock = stm_lock; nor->flash_unlock = stm_unlock; nor->flash_is_locked = stm_is_locked; |