* [PATCH v3] nvmem: fix nvmem_cell_get_from_lookup()
@ 2018-10-03 7:31 Bartosz Golaszewski
2018-10-03 8:28 ` Srinivas Kandagatla
0 siblings, 1 reply; 2+ messages in thread
From: Bartosz Golaszewski @ 2018-10-03 7:31 UTC (permalink / raw)
To: Srinivas Kandagatla, Arnd Bergmann, Greg KH, Stephen Rothwell
Cc: linux-arm-kernel, linux-kernel, Bartosz Golaszewski
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
We check if the pointer returned by __nvmem_device_get() is not NULL
while we should actually check if it is not IS_ERR(nvmem). Fix it.
While we're at it: fix the next error path where we should assign an
error value to cell before returning.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
v1 -> v2:
- use ERR_CAST() instead of a direct pointer cast
v2 -> v3:
- added the Reported-by tag
drivers/nvmem/core.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index ad1227df1984..f49474e1ad49 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -952,9 +952,9 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id)
(strcmp(lookup->con_id, con_id) == 0)) {
/* This is the right entry. */
nvmem = __nvmem_device_get(NULL, lookup->nvmem_name);
- if (!nvmem) {
+ if (IS_ERR(nvmem)) {
/* Provider may not be registered yet. */
- cell = ERR_PTR(-EPROBE_DEFER);
+ cell = ERR_CAST(nvmem);
goto out;
}
@@ -962,6 +962,7 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id)
lookup->cell_name);
if (!cell) {
__nvmem_device_put(nvmem);
+ cell = ERR_PTR(-ENOENT);
goto out;
}
}
--
2.19.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] nvmem: fix nvmem_cell_get_from_lookup()
2018-10-03 7:31 [PATCH v3] nvmem: fix nvmem_cell_get_from_lookup() Bartosz Golaszewski
@ 2018-10-03 8:28 ` Srinivas Kandagatla
0 siblings, 0 replies; 2+ messages in thread
From: Srinivas Kandagatla @ 2018-10-03 8:28 UTC (permalink / raw)
To: Bartosz Golaszewski, Arnd Bergmann, Greg KH, Stephen Rothwell
Cc: linux-arm-kernel, linux-kernel, Bartosz Golaszewski
On 03/10/18 08:31, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
>
> We check if the pointer returned by __nvmem_device_get() is not NULL
> while we should actually check if it is not IS_ERR(nvmem). Fix it.
>
> While we're at it: fix the next error path where we should assign an
> error value to cell before returning.
>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> v1 -> v2:
> - use ERR_CAST() instead of a direct pointer cast
>
> v2 -> v3:
> - added the Reported-by tag
>
> drivers/nvmem/core.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index ad1227df1984..f49474e1ad49 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -952,9 +952,9 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id)
> (strcmp(lookup->con_id, con_id) == 0)) {
> /* This is the right entry. */
> nvmem = __nvmem_device_get(NULL, lookup->nvmem_name);
> - if (!nvmem) {
> + if (IS_ERR(nvmem)) {
> /* Provider may not be registered yet. */
> - cell = ERR_PTR(-EPROBE_DEFER);
> + cell = ERR_CAST(nvmem);
> goto out;
> }
>
> @@ -962,6 +962,7 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id)
> lookup->cell_name);
> if (!cell) {
> __nvmem_device_put(nvmem);
> + cell = ERR_PTR(-ENOENT);
> goto out;
> }
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-03 8:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-03 7:31 [PATCH v3] nvmem: fix nvmem_cell_get_from_lookup() Bartosz Golaszewski
2018-10-03 8:28 ` Srinivas Kandagatla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).