leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qlcnic: Fix missing error codes

Browse Source 
In the original code, the error codes returned from some of the functions
are not caught and sent up the caller chain. Fixed it here.

Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sony Chacko 2010-08-26 14:02:41 +00:00 committed by David S. Miller
parent 53f91dc1f7
commit 8cfdce0807
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/qlcnic/qlcnic_main.c
View File

@ -967,7 +967,8 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
if (load_fw_file)
qlcnic_request_firmware(adapter);
else {
if (qlcnic_check_flash_fw_ver(adapter))
err = qlcnic_check_flash_fw_ver(adapter);
if (err)
goto err_out;
adapter->fw_type = QLCNIC_FLASH_ROMIMAGE;
@ -998,9 +999,11 @@ set_dev_ready:
QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_READY);
qlcnic_idc_debug_info(adapter, 1);
if (qlcnic_set_default_offload_settings(adapter))
err = qlcnic_set_default_offload_settings(adapter);
if (err)
goto err_out;
if (qlcnic_reset_npar_config(adapter))
err = qlcnic_reset_npar_config(adapter);
if (err)
goto err_out;
qlcnic_dev_set_npar_ready(adapter);
qlcnic_check_options(adapter);
@ -1515,7 +1518,8 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (qlcnic_read_mac_addr(adapter))
dev_warn(&pdev->dev, "failed to read mac addr\n");
if (qlcnic_setup_idc_param(adapter))
err = qlcnic_setup_idc_param(adapter);
if (err)
goto err_out_iounmap;
err = adapter->nic_ops->start_firmware(adapter);