mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
staging: qlge: add unregister_netdev in qlge_probe
[ Upstream commit4fcc0c275e
] unregister_netdev need to be called when register_netdev succeeds qlge_health_create_reporters fails. Fixes:d8827ae8e2
("staging: qlge: deal with the case that devlink_health_reporter_create fails") Signed-off-by: Hangyu Hua <hbh25y@gmail.com> Link: https://lore.kernel.org/r/20220221085552.93561-1-hbh25y@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
0646c78208
commit
e950cd7a7e
1 changed files with 7 additions and 4 deletions
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue