[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200217195435.9309-6-brgl@bgdev.pl>
Date: Mon, 17 Feb 2020 20:54:34 +0100
From: Bartosz Golaszewski <brgl@...ev.pl>
To: Linus Walleij <linus.walleij@...aro.org>,
Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
Khouloud Touil <ktouil@...libre.com>
Cc: linux-gpio@...r.kernel.org, linux-kernel@...r.kernel.org,
geert@...ux-m68k.org,
Bartosz Golaszewski <bgolaszewski@...libre.com>
Subject: [PATCH 5/6] nvmem: release the write-protect pin
From: Khouloud Touil <ktouil@...libre.com>
Put the write-protect GPIO descriptor in nvmem_release() and in the
error path in nvmem_register().
Fixes: 2a127da461a9 ("nvmem: add support for the write-protect pin")
Reported-by: geert@...ux-m68k.org
Signed-off-by: Khouloud Touil <ktouil@...libre.com>
[Bartosz:
- also put the gpio in error path in nvmem_register(),
- tweak the commit message: the GPIO is not auto-released]
Signed-off-by: Bartosz Golaszewski <bgolaszewski@...libre.com>
---
drivers/nvmem/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 07af9edea9cf..096c7bae9e74 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -72,6 +72,7 @@ static void nvmem_release(struct device *dev)
struct nvmem_device *nvmem = to_nvmem_device(dev);
ida_simple_remove(&nvmem_ida, nvmem->id);
+ gpiod_put(nvmem->wp_gpio);
kfree(nvmem);
}
@@ -430,6 +431,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
device_del(&nvmem->dev);
err_put_device:
put_device(&nvmem->dev);
+ gpiod_put(nvmem->wp_gpio);
err_ida_remove:
ida_simple_remove(&nvmem_ida, nvmem->id);
--
2.25.0
Powered by blists - more mailing lists