lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: defxx: Fix missing err handling in dfx_init()

Browse Source 
[ Upstream commit ae18dcdff0f8d7e84cd3fd9f496518b5e72d185d ]

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: e89a2cfb7d ("[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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yongqiang Liu 2022-12-07 07:20:45 +00:00 committed by Greg Kroah-Hartman
parent f54731a70c
commit bba527e4ec
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/fddi/defxx.c
View File

@ -3844,10 +3844,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;
}