| From 2669fae9e587e60d37351fb47d495fa3940be824 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 7 Aug 2018 13:19:35 +0100 |
| Subject: nvmem: core: return error code instead of NULL from nvmem_device_get |
| |
| From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| |
| [ Upstream commit ca6ac25cecf0e740d7cc8e03e0ebbf8acbeca3df ] |
| |
| nvmem_device_get() should return ERR_PTR() on error or valid pointer |
| on success, but one of the code path seems to return NULL, so fix it. |
| |
| Reported-by: Niklas Cassel <niklas.cassel@linaro.org> |
| Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.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 d32eba11c000f..30c040786fde2 100644 |
| --- a/drivers/nvmem/core.c |
| +++ b/drivers/nvmem/core.c |
| @@ -692,7 +692,7 @@ static struct nvmem_device *nvmem_find(const char *name) |
| d = bus_find_device_by_name(&nvmem_bus_type, NULL, name); |
| |
| if (!d) |
| - return NULL; |
| + return ERR_PTR(-ENOENT); |
| |
| return to_nvmem_device(d); |
| } |
| -- |
| 2.20.1 |
| |
