diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-19 19:08:46 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-19 19:08:46 -0800 |
| commit | 56495a2442a47d0ea752db62434913b3346fe5a5 (patch) | |
| tree | 35284af165304f4fe47f0214a48a8708f76a0d28 /drivers/net/ethernet/faraday | |
| parent | 657bc1d10bfc23ac06d5d687ce45826c760744f9 (diff) | |
| parent | 4d02da974ea85a62074efedf354e82778f910d82 (diff) | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/faraday')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 983b6db2d80d..88bfe2107938 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1926,6 +1926,8 @@ err_register_netdev: err_phy_connect: ftgmac100_phy_disconnect(netdev); err_ncsi_dev: + if (priv->ndev) + ncsi_unregister_dev(priv->ndev); ftgmac100_destroy_mdio(netdev); err_setup_mdio: iounmap(priv->base); @@ -1945,6 +1947,8 @@ static int ftgmac100_remove(struct platform_device *pdev) netdev = platform_get_drvdata(pdev); priv = netdev_priv(netdev); + if (priv->ndev) + ncsi_unregister_dev(priv->ndev); unregister_netdev(netdev); clk_disable_unprepare(priv->rclk); |