From patchwork Thu Mar 10 04:55:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raja Mani X-Patchwork-Id: 8553901 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 CCCDBC0553 for ; Thu, 10 Mar 2016 04:56:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AAF5202E9 for ; Thu, 10 Mar 2016 04:56:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17914202E6 for ; Thu, 10 Mar 2016 04:56:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753638AbcCJEzb (ORCPT ); Wed, 9 Mar 2016 23:55:31 -0500 Received: from wolverine02.qualcomm.com ([199.106.114.251]:56625 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271AbcCJEza (ORCPT ); Wed, 9 Mar 2016 23:55:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1457585729; x=1489121729; h=from:to:cc:subject:date:message-id:mime-version; bh=iyRjUqli35+iYdL4Ojr7Ym6CY0ZXtxNbcGHgjtX1bKs=; b=AiCyByQwnUA8hgJPpzJ83l8SsZj86kq2I8Qx/FfpyUjbtemijwmWLoD7 7l9Q/s4lee2iLsr786vqrYhD+NfeKk57Z5HqsVkIUtWkXkMPwA9c5O/On 8cp7xewR27h8BS70PqrLZRoVc6rdgVVDAlayuSMuBzCY8mJs8gAinVgVo A=; X-IronPort-AV: E=Sophos;i="5.24,314,1455004800"; d="scan'208";a="270034153" Received: from ironmsg02-l-new.qualcomm.com (HELO ironmsg02-L.qualcomm.com) ([10.53.140.109]) by wolverine02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 09 Mar 2016 20:55:29 -0800 X-IronPort-AV: E=McAfee;i="5700,7163,8099"; a="653709700" Received: from nasanexm01f.na.qualcomm.com ([10.85.0.32]) by ironmsg02-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 09 Mar 2016 20:55:28 -0800 Received: from aphydexm01a.ap.qualcomm.com (10.252.127.10) by NASANEXM01F.na.qualcomm.com (10.85.0.32) with Microsoft SMTP Server (TLS) id 15.0.1130.7; Wed, 9 Mar 2016 20:55:27 -0800 Received: from 10.80.81.91 (10.80.80.8) by aphydexm01a.ap.qualcomm.com (10.252.127.10) with Microsoft SMTP Server (TLS) id 15.0.1130.7; Thu, 10 Mar 2016 10:25:20 +0530 Received: by 10.80.81.91 (sSMTP sendmail emulation); Thu, 10 Mar 2016 10:25:12 +0530 From: Raja Mani To: CC: , Raja Mani Subject: [PATCH] ath10k: free cached fw bin contents when get board id fails Date: Thu, 10 Mar 2016 10:25:07 +0530 Message-ID: <1457585707-11344-1-git-send-email-rmani@qti.qualcomm.com> X-Mailer: git-send-email 1.8.1.2 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01G.na.qualcomm.com (10.85.0.33) To aphydexm01a.ap.qualcomm.com (10.252.127.10) 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_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 ath10k_core_probe_fw() simply returns error without freeing cached firmware file content when get board id operation fails. Free cached fw bin data in failure case to avoid memory leak. Fixes: db0984e51a18 ("ath10k: select board data based on BMI chip id and board id") Signed-off-by: Raja Mani --- drivers/net/wireless/ath/ath10k/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 4d31764..a76d8ac 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1833,7 +1833,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar) if (ret && ret != -EOPNOTSUPP) { ath10k_err(ar, "failed to get board id from otp: %d\n", ret); - return ret; + goto err_free_firmware_files; } ret = ath10k_core_fetch_board_file(ar);