Commit 6825e5a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3039fadf 834de5c1
...@@ -3780,8 +3780,6 @@ static int spi_nor_init_params(struct spi_nor *nor, ...@@ -3780,8 +3780,6 @@ static int spi_nor_init_params(struct spi_nor *nor,
default: default:
/* Kept only for backward compatibility purpose. */ /* Kept only for backward compatibility purpose. */
params->quad_enable = spansion_quad_enable; params->quad_enable = spansion_quad_enable;
if (nor->clear_sr_bp)
nor->clear_sr_bp = spi_nor_spansion_clear_sr_bp;
break; break;
} }
...@@ -4035,6 +4033,9 @@ static int spi_nor_init(struct spi_nor *nor) ...@@ -4035,6 +4033,9 @@ static int spi_nor_init(struct spi_nor *nor)
int err; int err;
if (nor->clear_sr_bp) { 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); err = nor->clear_sr_bp(nor);
if (err) { if (err) {
dev_err(nor->dev, dev_err(nor->dev,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment