diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-12-03 23:51:22 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-04 16:56:42 -0800 |
| commit | 0cb96b5749bf500f3612cda52fc98eb795fcd62d (patch) | |
| tree | f688aa67d6d94fa0a5656999e4903d5ad9b21e7f /drivers/net | |
| parent | ionic: keep users rss hash across lif reset (diff) | |
| download | linux-dev-0cb96b5749bf500f3612cda52fc98eb795fcd62d.tar.xz linux-dev-0cb96b5749bf500f3612cda52fc98eb795fcd62d.zip | |
net: sfp: fix unbind
When unbinding, we don't correctly tear down the module state, leaving
(for example) the hwmon registration behind. Ensure everything is
properly removed by sending a remove event at unbind.
Fixes: 6b0da5c9c1a3 ("net: sfp: track upstream's attachment state in state machine")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/sfp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index bdbbb76f8fd3..c118d9f0195b 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -2294,6 +2294,10 @@ static int sfp_remove(struct platform_device *pdev) sfp_unregister_socket(sfp->sfp_bus); + rtnl_lock(); + sfp_sm_event(sfp, SFP_E_REMOVE); + rtnl_unlock(); + return 0; } |