diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2021-05-17 12:04:13 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-05-17 15:50:58 -0700 |
| commit | 1dde47a66d4fb181830d6fa000e5ea86907b639e (patch) | |
| tree | 79c1bf119de5e69c4ad4441464a8bb124a864381 | |
| parent | Merge branch 'gve-fixes' (diff) | |
| download | wireguard-linux-1dde47a66d4fb181830d6fa000e5ea86907b639e.tar.xz wireguard-linux-1dde47a66d4fb181830d6fa000e5ea86907b639e.zip | |
net: mdiobus: get rid of a BUG_ON()
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>
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index dadf75ff3ab9..6045ad3def12 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++) { |