diff options
| author | Paul Cercueil <paul@crapouillou.net> | 2021-03-07 13:17:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-08 12:01:58 -0800 |
| commit | ac88c531a5b38877eba2365a3f28f0c8b513dc33 (patch) | |
| tree | f31ab58ed266dc600b583e5c68a7d9c67273c6f7 /drivers/net/ethernet | |
| parent | 03cbb87054c17b50a6ead63ed3ab02e094a785b1 (diff) | |
| download | lwn-ac88c531a5b38877eba2365a3f28f0c8b513dc33.tar.gz lwn-ac88c531a5b38877eba2365a3f28f0c8b513dc33.zip | |
net: davicom: Fix regulator not turned off on failed probe
When the probe fails or requests to be defered, we must disable the
regulator that was previously enabled.
Fixes: 7994fe55a4a2 ("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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/davicom/dm9000.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 3fdc70dab5c1..ae744826bb9e 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -1449,7 +1449,7 @@ dm9000_probe(struct platform_device *pdev) if (ret) { dev_err(dev, "failed to request reset gpio %d: %d\n", reset_gpios, ret); - return -ENODEV; + goto out_regulator_disable; } /* According to manual PWRST# Low Period Min 1ms */ @@ -1461,8 +1461,10 @@ dm9000_probe(struct platform_device *pdev) if (!pdata) { pdata = dm9000_parse_dt(&pdev->dev); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); + if (IS_ERR(pdata)) { + ret = PTR_ERR(pdata); + goto out_regulator_disable; + } } /* Init network device */ @@ -1703,6 +1705,10 @@ out: dm9000_release_board(pdev, db); free_netdev(ndev); +out_regulator_disable: + if (!IS_ERR(power)) + regulator_disable(power); + return ret; } |