Skip to content

Commit 7aeb97c

Browse files
Dan Carpenterlag-google
authored andcommitted
net: mdiobus: get rid of a BUG_ON()
[ Upstream commit 1dde47a ] 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> Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I0faa737c71f6ba758c8f645af42e210bec380386
1 parent f08d08a commit 7aeb97c

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/net/phy/mdio_bus.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,8 @@ void mdiobus_unregister(struct mii_bus *bus)
299299
{
300300
int i;
301301

302-
BUG_ON(bus->state != MDIOBUS_REGISTERED);
302+
if (WARN_ON_ONCE(bus->state != MDIOBUS_REGISTERED))
303+
return;
303304
bus->state = MDIOBUS_UNREGISTERED;
304305

305306
device_del(&bus->dev);

0 commit comments

Comments
 (0)