@@ -343,7 +343,7 @@ void ath6kl_core_cleanup(struct ath6kl *ar)
kfree(ar->fw_board);
kfree(ar->fw_otp);
- vfree(ar->fw);
+ kvfree(ar->fw);
kfree(ar->fw_patch);
kfree(ar->fw_testscript);
@@ -673,10 +673,15 @@ static int ath6kl_get_fw(struct ath6kl *ar, const char *filename,
return ret;
*fw_len = fw_entry->size;
- *fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
+ if (&ar->fw == fw)
+ *fw = vmalloc(fw_entry->size);
+ else
+ *fw = kmalloc(fw_entry->size);
if (*fw == NULL)
ret = -ENOMEM;
+ else
+ memcpy(*fw, fw_entry->data, fw_entry->size);
release_firmware(fw_entry);
Signed-off-by: Brent Taylor <motobud@gmail.com> ath6kl: Use vmalloc for loading firmware using api1 method and free using kvfree --- Changes v1 -> v2: - simplify memory allocation - use kvfree drivers/net/wireless/ath/ath6kl/core.c | 2 +- drivers/net/wireless/ath/ath6kl/init.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-)