From 407543a2ff43b6e6265ee52c82ed78a8d7fd2ae8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 16 Mar 2022 12:40:14 +0100 Subject: [PATCH] Revert "mtd: core: Fix a conflict between MTD and NVMEM on wp-gpios property" This reverts commit 453a82127f17c6d89a1fd14423133c6ae5355f2c as it breaks the KABI. It will be reverted the next KABI gate in a week. Fixes: 8993e6067f26 ("Linux 5.15.26") Signed-off-by: Greg Kroah-Hartman Change-Id: I77fe1425a713d080dcdec1cea148c25c3783b982 --- drivers/mtd/mtdcore.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 61f236e0378a..54df9cfd588e 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -546,7 +546,6 @@ static int mtd_nvmem_add(struct mtd_info *mtd) config.stride = 1; config.read_only = true; config.root_only = true; - config.ignore_wp = true; config.no_of_node = !of_device_is_compatible(node, "nvmem-cells"); config.priv = mtd; @@ -831,7 +830,6 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd, config.owner = THIS_MODULE; config.type = NVMEM_TYPE_OTP; config.root_only = true; - config.ignore_wp = true; config.reg_read = reg_read; config.size = size; config.of_node = np;