niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: davicom: Fix regulator not turned off on driver removal

Browse source 
We must disable the regulator that was enabled in the probe function.

Fixes: 7994fe55a4 ("dm9000: Add regulator and reset support to dm9000")
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paul Cercueil 2021-03-07 13:17:48 +00:00 • committed by David S. Miller
parent ac88c531a5
commit cf9e60aa69
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/ethernet/davicom/dm9000.c
View file

@ -133,6 +133,8 @@ struct board_info {
u32 wake_state; u32 wake_state;
int ip_summed; int ip_summed;
struct regulator *power_supply;
}; };
/* debug code */ /* debug code */
@ -1481,6 +1483,8 @@ dm9000_probe(struct platform_device *pdev)
db->dev = &pdev->dev; db->dev = &pdev->dev;
db->ndev = ndev; db->ndev = ndev;
if (!IS_ERR(power))
db->power_supply = power;
spin_lock_init(&db->lock); spin_lock_init(&db->lock);
mutex_init(&db->addr_lock); mutex_init(&db->addr_lock);
@ -1766,10 +1770,13 @@ static int
dm9000_drv_remove(struct platform_device *pdev) dm9000_drv_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
struct board_info *dm = to_dm9000_board(ndev);
unregister_netdev(ndev); unregister_netdev(ndev);
dm9000_release_board(pdev, netdev_priv(ndev)); dm9000_release_board(pdev, dm);
free_netdev(ndev); /* free device structure */ free_netdev(ndev); /* free device structure */
if (dm->power_supply)
regulator_disable(dm->power_supply);
dev_dbg(&pdev->dev, "released and freed device\n"); dev_dbg(&pdev->dev, "released and freed device\n");
return 0; return 0;