| From ac88c531a5b38877eba2365a3f28f0c8b513dc33 Mon Sep 17 00:00:00 2001 |
| From: Paul Cercueil <paul@crapouillou.net> |
| Date: Sun, 7 Mar 2021 13:17:47 +0000 |
| Subject: net: davicom: Fix regulator not turned off on failed probe |
| |
| From: Paul Cercueil <paul@crapouillou.net> |
| |
| commit ac88c531a5b38877eba2365a3f28f0c8b513dc33 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/davicom/dm9000.c | 12 +++++++++--- |
| 1 file changed, 9 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/davicom/dm9000.c |
| +++ b/drivers/net/ethernet/davicom/dm9000.c |
| @@ -1454,7 +1454,7 @@ dm9000_probe(struct platform_device *pde |
| 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 */ |
| @@ -1466,8 +1466,10 @@ dm9000_probe(struct platform_device *pde |
| |
| 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 */ |
| @@ -1708,6 +1710,10 @@ out: |
| dm9000_release_board(pdev, db); |
| free_netdev(ndev); |
| |
| +out_regulator_disable: |
| + if (!IS_ERR(power)) |
| + regulator_disable(power); |
| + |
| return ret; |
| } |
| |
