diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-07 09:52:22 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-08 13:59:49 -0500 |
| commit | 9441b85d59ec9d06cbe749e12a59a06c09e601fa (patch) | |
| tree | ced91b7876e74794bba25d97a62d028590bebe4c /drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |
| parent | 9563fe1696fa0ced8cfa3f935736d4662a81c1c3 (diff) | |
| download | op-kernel-dev-9441b85d59ec9d06cbe749e12a59a06c09e601fa.zip op-kernel-dev-9441b85d59ec9d06cbe749e12a59a06c09e601fa.tar.gz | |
iwlwifi: return error if loading uCode failed
In "iwlwifi: consolidate the start_device flow"
the code flow changed and the firmware is now
loaded by the transport layer, but the change
unfortunately lost error checking -- restore.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 1c4fbcd..ef76a39 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c @@ -1070,9 +1070,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL); /* Load the given image to the HW */ - iwl_load_given_ucode(trans, fw); - - return 0; + return iwl_load_given_ucode(trans, fw); } /* |
