From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C1521891D3; Wed, 3 Jul 2024 10:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720004378; cv=none; b=KzCfk4j5aVanGkynZzPIILarv/t6Bz61O22Lj6SwB/M9ra/pjt4Q0yyyk+Kwe68EnCLwAWOHHZiPhzL2C1ZcCGs6grubtGwepqjxgI5+R+bzsiiL/+YKNw0PWpy4BHyuXeCO0dZoE7FR9lDkDEeD7xCzptoiNQxbwH7ue7u4eGA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720004378; c=relaxed/simple; bh=3Ge3pLzjUAVI4CQ6/Nyz2dRoNE0W7EC1xWWTj5poLK8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WFfoLvdNRxF8i8ze6WNF8p9E7JNkI7dMVpALy3KPbB+UExQAQK0vTXA98cjvM427e6VLhmuXXbEZgnhOwC88xJruMiG+YJZVQoixemTzdPmPIVNhm4nUPf08O9nsh/WjmGTK+80klGtrBbgi30Nnivno/RupMZrJgN5pPGqYRDA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Dj8WeNNr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Dj8WeNNr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C983EC2BD10; Wed, 3 Jul 2024 10:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720004378; bh=3Ge3pLzjUAVI4CQ6/Nyz2dRoNE0W7EC1xWWTj5poLK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dj8WeNNrpD7l/s1YrRzw7o1NQiBUrhmdsLDAw6VGNYp4mcswaGKrCsaPz5n6TKS02 C1CnrVDHvxGFVbJE/qiU6izNwotn2gr7KJIniTGPGeQFvmfgUKaLbLuPqGWYOYK6Fk joUVWUiedDX/bX4fALFtHiTn6eKqJOypmzOwEMpA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shahar S Matityahu , Luciano Coelho , Miri Korenblit , Johannes Berg , Sasha Levin Subject: [PATCH 5.10 007/290] wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Date: Wed, 3 Jul 2024 12:36:28 +0200 Message-ID: <20240703102904.458109117@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703102904.170852981@linuxfoundation.org> References: <20240703102904.170852981@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shahar S Matityahu [ Upstream commit 87821b67dea87addbc4ab093ba752753b002176a ] The driver should call iwl_dbg_tlv_free even if debugfs is not defined since ini mode does not depend on debugfs ifdef. Fixes: 68f6f492c4fa ("iwlwifi: trans: support loading ini TLVs from external file") Signed-off-by: Shahar S Matityahu Reviewed-by: Luciano Coelho Signed-off-by: Miri Korenblit Link: https://msgid.link/20240510170500.c8e3723f55b0.I5e805732b0be31ee6b83c642ec652a34e974ff10@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index ab84ac3f8f03f..bf00c2fede746 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1699,8 +1699,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) err_fw: #ifdef CONFIG_IWLWIFI_DEBUGFS debugfs_remove_recursive(drv->dbgfs_drv); - iwl_dbg_tlv_free(drv->trans); #endif + iwl_dbg_tlv_free(drv->trans); kfree(drv); err: return ERR_PTR(ret); -- 2.43.0