| From 0c3172d31b27385f1cb69347a263369271e41a24 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 17 May 2021 12:04:13 +0300 |
| Subject: net: mdiobus: get rid of a BUG_ON() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit 1dde47a66d4fb181830d6fa000e5ea86907b639e ] |
| |
| We spotted a bug recently during a review where a driver was |
| unregistering a bus that wasn't registered, which would trigger this |
| BUG_ON(). Let's handle that situation more gracefully, and just print |
| a warning and return. |
| |
| Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> |
| Reviewed-by: Andrew Lunn <andrew@lunn.ch> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/phy/mdio_bus.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c |
| index 823518554079..d3c916821b11 100644 |
| --- a/drivers/net/phy/mdio_bus.c |
| +++ b/drivers/net/phy/mdio_bus.c |
| @@ -607,7 +607,8 @@ void mdiobus_unregister(struct mii_bus *bus) |
| struct mdio_device *mdiodev; |
| int i; |
| |
| - BUG_ON(bus->state != MDIOBUS_REGISTERED); |
| + if (WARN_ON_ONCE(bus->state != MDIOBUS_REGISTERED)) |
| + return; |
| bus->state = MDIOBUS_UNREGISTERED; |
| |
| for (i = 0; i < PHY_MAX_ADDR; i++) { |
| -- |
| 2.30.2 |
| |