lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 33/44] nvmem: core: return error code instead of NULL from nvmem_device_get
    Date
    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 931cc33e46f02..5d6d1bb4f1106 100644
    --- a/drivers/nvmem/core.c
    +++ b/drivers/nvmem/core.c
    @@ -457,7 +457,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);
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-08 12:49    [W:3.334 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site