lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 302/639] firmware: arm_scmi: fix of_node leak in scmi_mailbox_check
    Date
    From: Steven Price <steven.price@arm.com>

    [ Upstream commit fa7fe29a645b4da08efe8ff2392898b88f9ded9f ]

    of_parse_phandle_with_args() requires the caller to call of_node_put() on
    the returned args->np pointer. Otherwise the reference count will remain
    incremented.

    However, in this case, since we don't actually use the returned pointer,
    we can simply pass in NULL.

    Fixes: aa4f886f3893f ("firmware: arm_scmi: add basic driver infrastructure for SCMI")
    Signed-off-by: Steven Price <steven.price@arm.com>
    Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/firmware/arm_scmi/driver.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
    index 09119e3f5c018..effc4c17e0fb9 100644
    --- a/drivers/firmware/arm_scmi/driver.c
    +++ b/drivers/firmware/arm_scmi/driver.c
    @@ -662,9 +662,7 @@ static int scmi_xfer_info_init(struct scmi_info *sinfo)

    static int scmi_mailbox_check(struct device_node *np)
    {
    - struct of_phandle_args arg;
    -
    - return of_parse_phandle_with_args(np, "mboxes", "#mbox-cells", 0, &arg);
    + return of_parse_phandle_with_args(np, "mboxes", "#mbox-cells", 0, NULL);
    }

    static int scmi_mbox_free_channel(int id, void *p, void *data)
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:18    [W:2.539 / U:1.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site