[PATCH v2] staging: qlge: add unregister_netdev in qlge_probe

* [PATCH v2] staging: qlge: add unregister_netdev in qlge_probe
@ 2022-02-21  2:23 Hangyu Hua
  2022-02-21  9:48 ` Dan Carpenter
  2022-02-21  9:56 ` Dan Carpenter
  0 siblings, 2 replies; 3+ messages in thread
From: Hangyu Hua @ 2022-02-21  2:23 UTC (permalink / raw)
  To: manishc, GR-Linux-NIC-Dev, coiby.xu, gregkh, dan.carpenter
  Cc: netdev, linux-staging, linux-kernel, Hangyu Hua

unregister_netdev need to be called when register_netdev succeeds
qlge_health_create_reporters fails.

Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
---

v2: use goto to fix this bug

 drivers/staging/qlge/qlge_main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 9873bb2a9ee4..113a3efd12e9 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -4605,14 +4605,12 @@ static int qlge_probe(struct pci_dev *pdev,
 	err = register_netdev(ndev);
 	if (err) {
 		dev_err(&pdev->dev, "net device registration failed.\n");
-		qlge_release_all(pdev);
-		pci_disable_device(pdev);
-		goto netdev_free;
+		goto cleanup_pdev;
 	}
 
 	err = qlge_health_create_reporters(qdev);
 	if (err)
-		goto netdev_free;
+		goto unregister_netdev;
 
 	/* Start up the timer to trigger EEH if
 	 * the bus goes dead
@@ -4626,6 +4624,11 @@ static int qlge_probe(struct pci_dev *pdev,
 	devlink_register(devlink);
 	return 0;
 
+unregister_netdev:
+	unregister_netdev(ndev);
+cleanup_pdev:
+	qlge_release_all(pdev);
+	pci_disable_device(pdev);
 netdev_free:
 	free_netdev(ndev);
 devlink_free:
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread