lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 113/138] pinctrl: sirf: atlas7: Add missing of_node_put()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>


    [ Upstream commit 7af355e6715b325d8af29822f4c3dbecd7eeebec ]

    Reference to 'sys2pci_np' should be dropped in all cases here, not only in
    error handling path.

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pinctrl/sirf/pinctrl-atlas7.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/drivers/pinctrl/sirf/pinctrl-atlas7.c
    +++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c
    @@ -5420,14 +5420,15 @@ static int atlas7_pinmux_probe(struct pl
    sys2pci_np = of_find_node_by_name(NULL, "sys2pci");
    if (!sys2pci_np)
    return -EINVAL;
    +
    ret = of_address_to_resource(sys2pci_np, 0, &res);
    + of_node_put(sys2pci_np);
    if (ret)
    return ret;
    +
    pmx->sys2pci_base = devm_ioremap_resource(&pdev->dev, &res);
    - if (IS_ERR(pmx->sys2pci_base)) {
    - of_node_put(sys2pci_np);
    + if (IS_ERR(pmx->sys2pci_base))
    return -ENOMEM;
    - }

    pmx->dev = &pdev->dev;


    \
     
     \ /
      Last update: 2017-11-28 12:46    [W:3.236 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site