diff options
| author | Yongqiang Liu <liuyongqiang13@huawei.com> | 2022-12-07 07:20:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-12-09 10:44:27 +0000 |
| commit | ae18dcdff0f8d7e84cd3fd9f496518b5e72d185d (patch) | |
| tree | 2d98a10a506407ae1782e55edb594e0618f2cc3e | |
| parent | 44aa5a6dba8283bfda28b1517af4de711c5652a4 (diff) | |
| download | linux-ae18dcdff0f8d7e84cd3fd9f496518b5e72d185d.tar.gz | |
net: defxx: Fix missing err handling in dfx_init()
When eisa_driver_register() or tc_register_driver() failed,
the modprobe defxx would fail with some err log as follows:
Error: Driver 'defxx' is already registered, aborting...
Fix this issue by adding err hanling in dfx_init().
Fixes: e89a2cfb7d7b5 ("[TC] defxx: TURBOchannel support")
Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/fddi/defxx.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index b584ffe38ad6..1fef8a9b1a0f 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c @@ -3831,10 +3831,24 @@ static int dfx_init(void) int status; status = pci_register_driver(&dfx_pci_driver); - if (!status) - status = eisa_driver_register(&dfx_eisa_driver); - if (!status) - status = tc_register_driver(&dfx_tc_driver); + if (status) + goto err_pci_register; + + status = eisa_driver_register(&dfx_eisa_driver); + if (status) + goto err_eisa_register; + + status = tc_register_driver(&dfx_tc_driver); + if (status) + goto err_tc_register; + + return 0; + +err_tc_register: + eisa_driver_unregister(&dfx_eisa_driver); +err_eisa_register: + pci_unregister_driver(&dfx_pci_driver); +err_pci_register: return status; } |