diff options
author | Dan Williams <dan.j.williams@intel.com> | 2021-06-09 03:16:11 +0300 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2021-06-09 03:16:11 +0300 |
commit | 54ada34b4dfdb864ac602e13ff87581abe517ce9 (patch) | |
tree | 8c92ca68c13e86b71f9cbf05a1a432c3ba4ea67b /drivers/net/phy/mdio_bus.c | |
parent | 605a5e41db7d8c930fb80115686991c4c1d08ee4 (diff) | |
parent | 4a2c1dcfaf59be4b357400d893c3f5daff6cab6c (diff) | |
download | linux-54ada34b4dfdb864ac602e13ff87581abe517ce9.tar.xz |
Merge branch 'rafael/acpica/cfmws' into for-5.14/cxl
Pick up the definition of the CXL Fixed Memory Window Structure from
Rafael's ACPICA development branch.
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
-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++) { |