diff options
| author | Oren Givon <oren.givon@intel.com> | 2016-01-25 12:00:42 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-01-31 12:48:41 +0200 |
| commit | 7e502e5bc546a8d8be188fa019fe6fcdf02e3c87 (patch) | |
| tree | fe56497a45760f237a92d5d9ec692dd566dbbc95 /drivers/net/wireless/intel/iwlwifi/iwl-drv.c | |
| parent | 69c7fda40921c125eeeef6a827f6270ac6aa1baa (diff) | |
| download | linux-7e502e5bc546a8d8be188fa019fe6fcdf02e3c87.tar.gz linux-7e502e5bc546a8d8be188fa019fe6fcdf02e3c87.tar.bz2 linux-7e502e5bc546a8d8be188fa019fe6fcdf02e3c87.zip | |
iwlwifi: fix name of ucode loaded for 8265 series
Fix the name of the ucode being loaded for 8265 series
to be: iwlwifi-8265-XX.ucode
Signed-off-by: Oren Givon <oren.givon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 7acb49075683..ab4c2a0470b2 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -243,8 +243,10 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) { char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev); - snprintf(drv->firmware_name, sizeof(drv->firmware_name), - "%s%c-%s.ucode", name_pre, rev_step, tag); + if (rev_step != 'A') + snprintf(drv->firmware_name, + sizeof(drv->firmware_name), "%s%c-%s.ucode", + name_pre, rev_step, tag); } IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n", |