OSDN Git Service

net: mdio-mux: bcm-iproc: call mdiobus_free() in error path
authorJon Mason <jon.mason@broadcom.com>
Mon, 8 May 2017 21:48:35 +0000 (17:48 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 May 2017 12:00:22 +0000 (14:00 +0200)
commit265d382cc8db2ad14eba3398041606cf44e7ec89
tree3a3fe662062cd12c21346c567bc4a38fa17657fe
parentced0a31e667fbf618591f0a76a8213018407cde0
net: mdio-mux: bcm-iproc: call mdiobus_free() in error path

[ 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