[11/13] nvmem: core: Always reference the device returned by nvmem_device_get()

Message ID 20190128155506.25566-12-srinivas.kandagatla@linaro.org
State New
Headers show
  • nvmem: patches for 5.1
Related show

Commit Message

Srinivas Kandagatla Jan. 28, 2019, 3:55 p.m.
From: Alban Bedel <albeu@free.fr>

In nvmem_device_get(), when the device lookup fails with DT it
currently fallback on nvmem_find() which is wrong for two reasons.
First nvmem_find() return NULL when nothing is found instead of an
ERR_PTR. But nvmem_find() also just lookup the device, it doesn't
reference the module and increment the reference count like it is done
in the DT path.

To fix this we replace the call to nvmem_find() with a call to
__nvmem_device_get() which does all the referencing and return a
proper ERR_PTR in case of error.

Signed-off-by: Alban Bedel <albeu@free.fr>

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

 drivers/nvmem/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index a749a5cb0a4e..1752768dd2d2 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -874,7 +874,7 @@  struct nvmem_device *nvmem_device_get(struct device *dev, const char *dev_name)
-	return nvmem_find(dev_name);
+	return __nvmem_device_get(NULL, dev_name);