lkml.org 
[lkml]   [2018]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 31/41] ethernet: fman: fix wrong of_node_put() in probe function
    Date
    From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

    [ Upstream commit ecb239d96d369c23c33d41708646df646de669f4 ]

    After getting a reference to the platform device's of_node the probe
    function ends up calling of_find_matching_node() using the node as an
    argument. The function takes care of decreasing the refcount on it. We
    are then incorrectly decreasing the refcount on that node again.

    This patch removes the unwarranted call to of_node_put().

    Fixes: 414fd46e7762 ("fsl/fman: Add FMan support")
    Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/freescale/fman/fman.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
    index 9530405030a7..97425d94e280 100644
    --- a/drivers/net/ethernet/freescale/fman/fman.c
    +++ b/drivers/net/ethernet/freescale/fman/fman.c
    @@ -2786,7 +2786,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
    if (!muram_node) {
    dev_err(&of_dev->dev, "%s: could not find MURAM node\n",
    __func__);
    - goto fman_node_put;
    + goto fman_free;
    }

    err = of_address_to_resource(muram_node, 0,
    @@ -2795,11 +2795,10 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
    of_node_put(muram_node);
    dev_err(&of_dev->dev, "%s: of_address_to_resource() = %d\n",
    __func__, err);
    - goto fman_node_put;
    + goto fman_free;
    }

    of_node_put(muram_node);
    - of_node_put(fm_node);

    err = devm_request_irq(&of_dev->dev, irq, fman_irq, 0, "fman", fman);
    if (err < 0) {
    --
    2.19.1
    \
     
     \ /
      Last update: 2018-12-13 05:43    [W:2.518 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site