diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-06-28 18:55:55 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-06-28 18:55:55 +0300 |
| commit | b90a16854d60f147cc6388dbe3e9765101c5b5a6 (patch) | |
| tree | 8f14b3d96cf0b052e68e88ab97c10a5370d528fd /drivers/net/wireless/intel/iwlwifi/dvm | |
| parent | 57c00f2fac512837f8de73474ec1f54020015bae (diff) | |
| parent | 6d759b02f4121595bf4212662e73c26573dab61a (diff) | |
| download | linux-b90a16854d60f147cc6388dbe3e9765101c5b5a6.tar.xz | |
Merge tag 'iwlwifi-next-for-kalle-2017-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
More iwlwifi patches for 4.13
* Some changes in suspend/resume handling to support new FWs;
* A bunch of RF-kill related fixes;
* Continued work towards the A000 family;
* Support for a new version of the TX flush FW API;
* Some fixes in monitor interfaces;
* A few fixes in the recovery flows;
* Johannes' documentation fixes and FW API struct cleanups continue;
* Remove some noise from the kernel logs;
* Some other small improvements, fixes and cleanups;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c index b49848683587..4c8f9f1a5532 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c @@ -1513,7 +1513,7 @@ out_destroy_workqueue: out_free_eeprom_blob: kfree(priv->eeprom_blob); out_free_eeprom: - iwl_free_nvm_data(priv->nvm_data); + kfree(priv->nvm_data); out_free_hw: ieee80211_free_hw(priv->hw); out: @@ -1532,7 +1532,7 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) iwl_tt_exit(priv); kfree(priv->eeprom_blob); - iwl_free_nvm_data(priv->nvm_data); + kfree(priv->nvm_data); /*netif_stop_queue(dev); */ flush_workqueue(priv->workqueue); |