From: Johannes Berg Date: Wed, 7 Mar 2012 17:52:22 +0000 (-0800) Subject: iwlwifi: return error if loading uCode failed X-Git-Tag: v3.4-rc1~177^2~108^2~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9441b85d59ec9d06cbe749e12a59a06c09e601fa;p=thirdparty%2Flinux.git 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 Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 1c4fbcd348a88..ef76a3916189a 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); } /*