diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2023-01-27 13:40:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-22 14:55:54 +0300 |
| commit | 89991ededcb557dcfe6398fa37eb182d01cfe257 (patch) | |
| tree | eac4388a3b0fc8442c738232fdddb3e04ffb5183 /drivers/nvmem | |
| parent | a19a0f67dbb89ad2bfc466f2003841acba645884 (diff) | |
| download | linux-89991ededcb557dcfe6398fa37eb182d01cfe257.tar.xz | |
nvmem: core: remove nvmem_config wp_gpio
[ Upstream commit 569653f022a29a1a44ea9de5308b657228303fa5 ]
No one provides wp_gpio, so let's remove it to avoid issues with
the nvmem core putting this gpio.
Cc: stable@vger.kernel.org
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230127104015.23839-5-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: ab3428cfd9aa ("nvmem: core: fix registration vs use race")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nvmem')
| -rw-r--r-- | drivers/nvmem/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 9da4edbabfe7..38c05fce7d74 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -627,9 +627,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->id = rval; - if (config->wp_gpio) - nvmem->wp_gpio = config->wp_gpio; - else if (!config->ignore_wp) + if (!config->ignore_wp) nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) { |