lkml.org 
[lkml]   [2014]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 32/66] phy: core: Fix error path in phy_create()
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Roger Quadros <rogerq@ti.com>

    commit e73b49f1c4e75c44d62585cc3e5b9c7894b61c32 upstream.

    Prevent resources from being freed twice in case device_add() call
    fails within phy_create(). Also use ida_simple_remove() instead of
    ida_remove() as we had used ida_simple_get() to allocate the ida.

    Signed-off-by: Roger Quadros <rogerq@ti.com>
    Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/phy/phy-core.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/drivers/phy/phy-core.c
    +++ b/drivers/phy/phy-core.c
    @@ -553,8 +553,9 @@ struct phy *phy_create(struct device *de
    return phy;

    put_dev:
    - put_device(&phy->dev);
    - ida_remove(&phy_ida, phy->id);
    + put_device(&phy->dev); /* calls phy_release() which frees resources */
    + return ERR_PTR(ret);
    +
    free_phy:
    kfree(phy);
    return ERR_PTR(ret);
    @@ -738,7 +739,7 @@ static void phy_release(struct device *d

    phy = to_phy(dev);
    dev_vdbg(dev, "releasing '%s'\n", dev_name(dev));
    - ida_remove(&phy_ida, phy->id);
    + ida_simple_remove(&phy_ida, phy->id);
    kfree(phy);
    }




    \
     
     \ /
      Last update: 2014-07-16 02:41    [W:3.205 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site