lkml.org 
[lkml]   [2018]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 07/20] net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

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


    [ Upstream commit 00777fac28ba3e126b9e63e789a613e8bd2cab25 ]

    If the optional regulator is deferred, we must release some resources.
    They will be re-allocated when the probe function will be called again.

    Fixes: 6eacf31139bf ("ethernet: arc: Add support for Rockchip SoC layer device tree bindings")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/arc/emac_rockchip.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/arc/emac_rockchip.c
    +++ b/drivers/net/ethernet/arc/emac_rockchip.c
    @@ -150,8 +150,10 @@ static int emac_rockchip_probe(struct pl
    /* Optional regulator for PHY */
    priv->regulator = devm_regulator_get_optional(dev, "phy");
    if (IS_ERR(priv->regulator)) {
    - if (PTR_ERR(priv->regulator) == -EPROBE_DEFER)
    - return -EPROBE_DEFER;
    + if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) {
    + err = -EPROBE_DEFER;
    + goto out_clk_disable;
    + }
    dev_err(dev, "no regulator found\n");
    priv->regulator = NULL;
    }

    \
     
     \ /
      Last update: 2018-03-29 20:12    [W:4.273 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site