Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9441b85d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9563fe16

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

}



/*