nvmem: core: return error code instead of NULL from nvmem_device_get
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tue, 7 Aug 2018 12:19:35 +0000 (13:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Nov 2019 08:52:16 +0000 (09:52 +0100)
[ 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

index 9ca24e4d5d49cbb2d578e72dc95b6b3deb6da8ba..2a0c5f3b0e50936e9e73b92a13d0564ed52e725f 100644 (file)
@@ -609,7 +609,7 @@ static struct nvmem_device *nvmem_find(const char *name)
        d = bus_find_device(&nvmem_bus_type, NULL, (void *)name, nvmem_match);
 
        if (!d)
-               return NULL;
+               return ERR_PTR(-ENOENT);
 
        return to_nvmem_device(d);
 }