lkml.org 
[lkml]   [2017]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 097/103] net: mdio-mux: bcm-iproc: call mdiobus_free() in error path
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jon Mason <jon.mason@broadcom.com>


    [ Upstream commit 922c60e89d52730050c6ccca218bff40cc8bcd8e ]

    If an error is encountered in mdio_mux_init(), the error path will call
    mdiobus_free(). Since mdiobus_register() has been called prior to
    mdio_mux_init(), the bus->state will not be MDIOBUS_UNREGISTERED. This
    causes a BUG_ON() in mdiobus_free(). To correct this issue, add an
    error path for mdio_mux_init() which calls mdiobus_unregister() prior to
    mdiobus_free().

    Signed-off-by: Jon Mason <jon.mason@broadcom.com>
    Fixes: 98bc865a1ec8 ("net: mdio-mux: Add MDIO mux driver for iProc SoCs")
    Acked-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/phy/mdio-mux-bcm-iproc.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/net/phy/mdio-mux-bcm-iproc.c
    +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c
    @@ -203,11 +203,14 @@ static int mdio_mux_iproc_probe(struct p
    &md->mux_handle, md, md->mii_bus);
    if (rc) {
    dev_info(md->dev, "mdiomux initialization failed\n");
    - goto out;
    + goto out_register;
    }

    dev_info(md->dev, "iProc mdiomux registered\n");
    return 0;
    +
    +out_register:
    + mdiobus_unregister(bus);
    out:
    mdiobus_free(bus);
    return rc;

    \
     
     \ /
      Last update: 2017-05-11 16:43    [W:4.902 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site