diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2017-09-02 08:56:45 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-09-03 20:18:25 -0700 |
| commit | 6d9c153a0b84392406bc77600aa7d3ea365de041 (patch) | |
| tree | e2fc30d0c51629f96443233b24c1de88b383d27a /drivers/net/dsa/dsa_loop.c | |
| parent | Merge branch 'l2tp-session-creation-fixes' (diff) | |
| download | wireguard-linux-6d9c153a0b84392406bc77600aa7d3ea365de041.tar.xz wireguard-linux-6d9c153a0b84392406bc77600aa7d3ea365de041.zip | |
net: dsa: loop: Do not unregister invalid fixed PHY
During error injection it was possible to crash in dsa_loop_exit() because of
an attempt to unregister an invalid PHY. We actually want to the driver probing
in dsa_loop_init() even though fixed_phy_register() may return an error to
exercise how DSA deals with such cases, but we should not be crashing during
driver removal.
Fixes: 98cd1552ea27 ("net: dsa: Mock-up driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/dsa_loop.c')
| -rw-r--r-- | drivers/net/dsa/dsa_loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index fdd8f3872102..8150e3a3c8dd 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -390,7 +390,7 @@ static void __exit dsa_loop_exit(void) mdio_driver_unregister(&dsa_loop_drv); for (i = 0; i < NUM_FIXED_PHYS; i++) - if (phydevs[i]) + if (!IS_ERR(phydevs[i])) fixed_phy_unregister(phydevs[i]); } module_exit(dsa_loop_exit); |