Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-2
+3
-2
drivers/mtd/spi-nor/spi-nor.c
+3
-2
drivers/mtd/spi-nor/spi-nor.c
···
3780
3780
default:
3781
3781
/* Kept only for backward compatibility purpose. */
3782
3782
params->quad_enable = spansion_quad_enable;
3783
-
if (nor->clear_sr_bp)
3784
-
nor->clear_sr_bp = spi_nor_spansion_clear_sr_bp;
3785
3783
break;
3786
3784
}
3787
3785
···
4033
4035
int err;
4034
4036
4035
4037
if (nor->clear_sr_bp) {
4038
+
if (nor->quad_enable == spansion_quad_enable)
4039
+
nor->clear_sr_bp = spi_nor_spansion_clear_sr_bp;
4040
+
4036
4041
err = nor->clear_sr_bp(nor);
4037
4042
if (err) {
4038
4043
dev_err(nor->dev,