| From 31457db3750c0b0ed229d836f2609fdb8a5b790e Mon Sep 17 00:00:00 2001 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Sun, 11 Apr 2021 11:02:08 +0200 |
| Subject: net: davicom: Fix regulator not turned off on failed probe |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| commit 31457db3750c0b0ed229d836f2609fdb8a5b790e upstream. |
| |
| When the probe fails, we must disable the regulator that was previously |
| enabled. |
| |
| This patch is a follow-up to commit ac88c531a5b3 |
| ("net: davicom: Fix regulator not turned off on failed probe") which missed |
| one case. |
| |
| Fixes: 7994fe55a4a2 ("dm9000: Add regulator and reset support to dm9000") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/davicom/dm9000.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/davicom/dm9000.c |
| +++ b/drivers/net/ethernet/davicom/dm9000.c |
| @@ -1474,8 +1474,10 @@ dm9000_probe(struct platform_device *pde |
| |
| /* Init network device */ |
| ndev = alloc_etherdev(sizeof(struct board_info)); |
| - if (!ndev) |
| - return -ENOMEM; |
| + if (!ndev) { |
| + ret = -ENOMEM; |
| + goto out_regulator_disable; |
| + } |
| |
| SET_NETDEV_DEV(ndev, &pdev->dev); |
| |
