lkml.org 
[lkml]   [2021]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH net] net: mdiobus: get rid of a BUG_ON()
On Sat, May 15, 2021 at 01:01:11PM +0300, Dan Carpenter wrote:
> 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 <linux@armlinux.org.uk>

This probably ought to be updated to:

Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

now please.

> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

> ---
> 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 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++) {
> --
> 2.30.2
>
>

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

\
 
 \ /
  Last update: 2021-05-15 12:16    [W:0.058 / U:0.596 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site