| Message ID | bd2244d44b914dec1aeccee4eba2e7e8135b585b.1683311885.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 27c1eaa07283b0c94becf8241f95368267cf558b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: mdio: mvusb: Fix an error handling path in mvusb_mdio_probe() | expand |
On Fri, May 05, 2023 at 08:39:33PM +0200, Christophe JAILLET wrote: > Should of_mdiobus_register() fail, a previous usb_get_dev() call should be > undone as in the .disconnect function. > > Fixes: 04e37d92fbed ("net: phy: add marvell usb to mdio controller") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Fri, May 05, 2023 at 08:39:33PM +0200, Christophe JAILLET wrote: > Should of_mdiobus_register() fail, a previous usb_get_dev() call should be > undone as in the .disconnect function. > > Fixes: 04e37d92fbed ("net: phy: add marvell usb to mdio controller") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 5 May 2023 20:39:33 +0200 you wrote: > Should of_mdiobus_register() fail, a previous usb_get_dev() call should be > undone as in the .disconnect function. > > Fixes: 04e37d92fbed ("net: phy: add marvell usb to mdio controller") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/net/mdio/mdio-mvusb.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) Here is the summary with links: - [net] net: mdio: mvusb: Fix an error handling path in mvusb_mdio_probe() https://git.kernel.org/netdev/net/c/27c1eaa07283 You are awesome, thank you!
diff --git a/drivers/net/mdio/mdio-mvusb.c b/drivers/net/mdio/mdio-mvusb.c index 68fc55906e78..554837c21e73 100644 --- a/drivers/net/mdio/mdio-mvusb.c +++ b/drivers/net/mdio/mdio-mvusb.c @@ -67,6 +67,7 @@ static int mvusb_mdio_probe(struct usb_interface *interface, struct device *dev = &interface->dev; struct mvusb_mdio *mvusb; struct mii_bus *mdio; + int ret; mdio = devm_mdiobus_alloc_size(dev, sizeof(*mvusb)); if (!mdio) @@ -87,7 +88,15 @@ static int mvusb_mdio_probe(struct usb_interface *interface, mdio->write = mvusb_mdio_write; usb_set_intfdata(interface, mvusb); - return of_mdiobus_register(mdio, dev->of_node); + ret = of_mdiobus_register(mdio, dev->of_node); + if (ret) + goto put_dev; + + return 0; + +put_dev: + usb_put_dev(mvusb->udev); + return ret; } static void mvusb_mdio_disconnect(struct usb_interface *interface)
Should of_mdiobus_register() fail, a previous usb_get_dev() call should be undone as in the .disconnect function. Fixes: 04e37d92fbed ("net: phy: add marvell usb to mdio controller") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/net/mdio/mdio-mvusb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)