From patchwork Fri Oct 16 05:10:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brent Taylor X-Patchwork-Id: 7410961 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1E2A6BF90C for ; Fri, 16 Oct 2015 05:12:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BDC62081A for ; Fri, 16 Oct 2015 05:12:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73DF7208B4 for ; Fri, 16 Oct 2015 05:12:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752582AbbJPFLP (ORCPT ); Fri, 16 Oct 2015 01:11:15 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:35214 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751912AbbJPFLN (ORCPT ); Fri, 16 Oct 2015 01:11:13 -0400 Received: by iofl186 with SMTP id l186so113131379iof.2; Thu, 15 Oct 2015 22:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=MXDEQN9wKRq3A+UTwdYFTF5VPPUGe5npgCl/ixipDeY=; b=VuUb16g7az5bU+OoJohfw/l48rNHcRl7CFbROySsJv/ZArmQeu9t0AfI7xEuu4bCkr x5NZuUQb+F/AIVPUPca9XqtGvVeLtP7dfXBOxpS8XsHxIrbGEuguRZInchqoVtvRDqvK cv6aIYRobd8aIiox12Tp+KGD+X7U03i2CiIqJ0/c8bzpHxjR7XytKpyOET7zDQj/Czmb 1u/gF0bAiyEgOdD87E8hDnlJ15q3LaNhQ7CGJfRxTexYOL3zMDcfqPDIvZRKAqhzmznO fYee7rq0gprE8B0Qjlnsc1j2F5LUKcvlw2iGHElm6JYBBXxCB/JjM0QtKi+Z/wZXenGH J/AA== X-Received: by 10.107.128.27 with SMTP id b27mr4800657iod.64.1444972273007; Thu, 15 Oct 2015 22:11:13 -0700 (PDT) Received: from cartman.taylor.net (c-73-168-44-213.hsd1.il.comcast.net. [73.168.44.213]) by smtp.gmail.com with ESMTPSA id f16sm1190995igt.5.2015.10.15.22.11.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 22:11:12 -0700 (PDT) From: Brent Taylor To: kvalo@qca.qualcomm.com Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ath6kl@lists.infradead.org, motobud@gmail.com Subject: [PATCH] ath6kl: Use vmalloc for loading firmware using api1 method Date: Fri, 16 Oct 2015 00:10:59 -0500 Message-Id: <1444972259-24260-1-git-send-email-motobud@gmail.com> X-Mailer: git-send-email 2.6.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Brent Taylor --- 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);