[PATCH] ath6kl: Use vmalloc for loading firmware using api1 method

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Brent Taylor <motobud@xxxxxxxxx>
---
 drivers/net/wireless/ath/ath6kl/init.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 6e473fa..2155739 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -673,10 +673,17 @@ 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 (*fw == NULL)
-		ret = -ENOMEM;
+	if (&ar->fw == fw) {
+		*fw = vmalloc(fw_entry->size);
+		if (*fw == NULL)
+			ret = -ENOMEM;
+		else
+			memcpy(*fw, fw_entry->data, fw_entry->size);
+	} else {
+		*fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
+		if (*fw == NULL)
+			ret = -ENOMEM;
+	}
 
 	release_firmware(fw_entry);
 
-- 
2.6.1


_______________________________________________
ath6kl mailing list
ath6kl@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/ath6kl



[Index of Archives]     [Linux Kernel]     [Linux Wireless]     [Linux Bluetooth]     [Linux WPAN]     [Linux Netdev]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]

  Powered by Linux