lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 280/757] nvmem: core: fix missing of_node_put() in of_nvmem_device_get()
    Date
    From: Vadym Kochan <vadym.kochan@plvision.eu>

    [ Upstream commit b1c194dcdb1425fa59eec61ab927cfff33096149 ]

    of_parse_phandle() returns device_node with incremented ref count
    which needs to be decremented by of_node_put() when device_node
    is not used.

    Fixes: e2a5402ec7c6 ("nvmem: Add nvmem_device based consumer apis.")
    Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Link: https://lore.kernel.org/r/20200917134437.16637-5-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 | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
    index 6cd3edb2eaf65..204a515d8bc5d 100644
    --- a/drivers/nvmem/core.c
    +++ b/drivers/nvmem/core.c
    @@ -835,6 +835,7 @@ struct nvmem_device *of_nvmem_device_get(struct device_node *np, const char *id)
    {

    struct device_node *nvmem_np;
    + struct nvmem_device *nvmem;
    int index = 0;

    if (id)
    @@ -844,7 +845,9 @@ struct nvmem_device *of_nvmem_device_get(struct device_node *np, const char *id)
    if (!nvmem_np)
    return ERR_PTR(-ENOENT);

    - return __nvmem_device_get(nvmem_np, device_match_of_node);
    + nvmem = __nvmem_device_get(nvmem_np, device_match_of_node);
    + of_node_put(nvmem_np);
    + return nvmem;
    }
    EXPORT_SYMBOL_GPL(of_nvmem_device_get);
    #endif
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:10    [W:4.022 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site