Commit-ID: 8cfdce080722101a7fd2a1eff9763ca4008ec626
Gitweb: http://git.kernel.org/tip/8cfdce080722101a7fd2a1eff9763ca4008ec626
Author: Sony Chacko <sony.chacko@xxxxxxxxxx>
AuthorDate: Thu, 26 Aug 2010 14:02:41 +0000
Committer: David S. Miller <davem@xxxxxxxxxxxxx>
CommitDate: Thu, 26 Aug 2010 17:13:18 -0700
qlcnic: Fix missing error codes
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@xxxxxxxxxx>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
---
drivers/net/qlcnic/qlcnic_main.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 630a077..1b8f67da 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|