Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1279270
| From | Brent Taylor <motobud@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree |
| Date | 2015-11-29 06:20 +0100 |
| Message-ID | <qA2z0-1ZG-9@gated-at.bofh.it> (permalink) |
| References | <qk5AR-4FE-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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(-) diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c index 4ec02ce..052e58b 100644 --- a/drivers/net/wireless/ath/ath6kl/core.c +++ b/drivers/net/wireless/ath/ath6kl/core.c @@ -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); diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 6e473fa..836afea2 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -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); -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH v2] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree Brent Taylor <motobud@gmail.com> - 2015-11-29 06:20 +0100
Re: [PATCH v2] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree kbuild test robot <lkp@intel.com> - 2015-11-29 06:30 +0100
[PATCH v3] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree Brent Taylor <motobud@gmail.com> - 2015-11-29 07:00 +0100
Re: [PATCH v3] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree Kalle Valo <kvalo@qca.qualcomm.com> - 2015-11-30 09:50 +0100
Re: [PATCH v2] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree Kalle Valo <kvalo@qca.qualcomm.com> - 2015-11-30 09:50 +0100
Re: [PATCH v2] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree Kalle Valo <kvalo@qca.qualcomm.com> - 2015-11-30 10:10 +0100
csiph-web