From patchwork Sun Nov 29 05:13:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brent Taylor X-Patchwork-Id: 7718001 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 ADD3FBEEE1 for ; Sun, 29 Nov 2015 05:16:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C962E2055B for ; Sun, 29 Nov 2015 05:16:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC0F92055A for ; Sun, 29 Nov 2015 05:16:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751461AbbK2FOs (ORCPT ); Sun, 29 Nov 2015 00:14:48 -0500 Received: from mail-io0-f170.google.com ([209.85.223.170]:34008 "EHLO mail-io0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970AbbK2FOE (ORCPT ); Sun, 29 Nov 2015 00:14:04 -0500 Received: by ioir85 with SMTP id r85so144879186ioi.1; Sat, 28 Nov 2015 21:14:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MNase8lent+uB+/ldhXy4ldzVKrBHk90rCyj/CEP18E=; b=RAs9NTjOm/lBxrlGA/CC01jHtW3ZU3wXfuVMe5SglxeB//7BWs2lnTYWMzFg6oLILd AlLWob2UmyAiUxZiMH1m0tazG/4lrU40mK6CkpcIceB/jiQDeAw2UxCB9GaUf0JBFQ5Q 0l641lPlXqJ0zpYp3Kl2oixpmPOKXxJ9Fmg8YLPLq7X4Y+HTUV1x9PoTuMZa6fvGLphM x0so9aca2t54L9h8JBDVMYp804if9MJi2tuCW4mNlv6DYpddZ9ztTqztv6N41AZjT9iY sUNbkFotZpHdvSwafcwMVpjQlODxgiC6kZ2uQpZrY+KQmH4zSqYqdjFOq9o9qck87iMU 77og== X-Received: by 10.107.17.160 with SMTP id 32mr56777410ior.28.1448774044011; Sat, 28 Nov 2015 21:14:04 -0800 (PST) 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 l41sm15641051iod.34.2015.11.28.21.14.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 28 Nov 2015 21:14:03 -0800 (PST) From: Brent Taylor To: kvalo@qca.qualcomm.com Cc: linux-wireless@vger.kernel.org, netdev@vger.kenrel.org, linux-kernel@vger.kernel.org, ath6kl@lists.infradead.org, Brent Taylor Subject: [PATCH v2] ath6kl: Use vmalloc for loading firmware using api1 method and use kvfree Date: Sat, 28 Nov 2015 23:13:58 -0600 Message-Id: <1448774038-26984-1-git-send-email-motobud@gmail.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1444972259-24260-1-git-send-email-motobud@gmail.com> References: <1444972259-24260-1-git-send-email-motobud@gmail.com> 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 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);