diff options
| author | Linus Torvalds | 2019-08-18 21:56:42 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-08-18 21:56:42 +0200 |
| commit | 6825e5a6c45dbd473f8b2993a065bbea15347632 (patch) | |
| tree | 52df289d9f503f2c378e74d32abde8dd96f3a866 /drivers | |
| parent | Merge tag 'for-5.3-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | mtd: spi-nor: Fix the disabling of write protection at init (diff) | |
| download | kernel-qcow2-linux-6825e5a6c45dbd473f8b2993a065bbea15347632.tar.gz kernel-qcow2-linux-6825e5a6c45dbd473f8b2993a065bbea15347632.tar.xz kernel-qcow2-linux-6825e5a6c45dbd473f8b2993a065bbea15347632.zip | |
Merge tag 'fixes-for-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD fix from Richard Weinberger:
"A single fix for MTD to correctly set the spi-nor WP pin"
* tag 'fixes-for-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
mtd: spi-nor: Fix the disabling of write protection at init
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 03cc788511d5..654bdc41fc99 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -3780,8 +3780,6 @@ static int spi_nor_init_params(struct spi_nor *nor, default: /* Kept only for backward compatibility purpose. */ params->quad_enable = spansion_quad_enable; - if (nor->clear_sr_bp) - nor->clear_sr_bp = spi_nor_spansion_clear_sr_bp; break; } @@ -4035,6 +4033,9 @@ static int spi_nor_init(struct spi_nor *nor) int err; if (nor->clear_sr_bp) { + if (nor->quad_enable == spansion_quad_enable) + nor->clear_sr_bp = spi_nor_spansion_clear_sr_bp; + err = nor->clear_sr_bp(nor); if (err) { dev_err(nor->dev, |