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 8458F14389C; Wed, 19 Jun 2024 13:13:06 +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=1718802786; cv=none; b=qRdEcGSDz6nKkw5va6mPrP9LM3ctVmcQbjqUXfnBtwA1PEz7ypP0eqNBWVcpRPBoTK7GIJ62o58l/ZnEVky4vEKkXwzjEhoDLBhDpM7s+x9NyRc8QawpfwoJFNQB/XH+dU9Fqx8YxpN0rON4af+TJqkviwPhhkkIxnGlsllwU1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802786; c=relaxed/simple; bh=Zzy1n4z/62pOqfTf9nPT7MAY902dUhAommHrdC/JaaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GxeNpyoCPI+N7Yi2fVerniCD40Z52PV6KNdmRT6RbaD8lu9z/ZxMhGM1BO0bDHHWwcP8xSNlf3yU8tNv3SjGARu2k/q+A98oEp8JP5v+5ncrTrp4SoeskN8nHMAtyWhtxuVZ4Ptdx1OjjXZdcwF314m8KkkjvvsWQBIOVFikrgI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fmnbKfvF; 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="fmnbKfvF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 091AAC2BBFC; Wed, 19 Jun 2024 13:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718802786; bh=Zzy1n4z/62pOqfTf9nPT7MAY902dUhAommHrdC/JaaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fmnbKfvFjnFDs9nxiwbb1HyganI1VImoPBk7EAarcAiaqfL8Zw/eM/8f8deKI/Uzi d+VGOpeXd2KbaJxQ1mDr4TddciBWilP/WPcSBVFKy6hrnSqWfCNN8fSscTL0QJKCZH K1eCPb0Q/J1l5/pvsrUSmn6K8Xr8ISlHU58SteEA= 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 6.9 015/281] wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Date: Wed, 19 Jun 2024 14:52:54 +0200 Message-ID: <20240619125610.434728717@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619125609.836313103@linuxfoundation.org> References: <20240619125609.836313103@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-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 1b7254569a37a..6c27ef2f7c7e5 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1821,8 +1821,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