From ba9d587a3d329b653f305f7a7d280ccdf7fb6dcb Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 7 Mar 2012 09:52:22 -0800 Subject: [PATCH] --- yaml --- r: 291305 b: refs/heads/master c: 9441b85d59ec9d06cbe749e12a59a06c09e601fa h: refs/heads/master i: 291303: 4feb706494c7ee50d5dab6585ed4ae260967db69 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 137203c7fe08..4b10ef352935 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9563fe1696fa0ced8cfa3f935736d4662a81c1c3 +refs/heads/master: 9441b85d59ec9d06cbe749e12a59a06c09e601fa diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 1c4fbcd348a8..ef76a3916189 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/trunk/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); } /*