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 F0A7116DEC3; Wed, 3 Jul 2024 11:13:55 +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=1720005236; cv=none; b=JdnGyzhWv4aXD3K96OXSgCgD1x8oqOMSByMZbx2tj/kLat0vwsJ+uNCRbAlKe0nki6sPt3DhqUiertu0WL1TfQGjuaa+hhFyBuW8Imh9qcAuP6d8PKdFWKCnU+t5Ys1m0k11MyTeieH9AJrnKpJysXsYeryOlEv0F58QW2+g27s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720005236; c=relaxed/simple; bh=LWaW1OTdIoLabw2pECk/QlWxh1aijxSFfl4zC1mVLDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l/6t2Ii2yScXKGPJlALiFMeKjEZyj2vbG6Og5W1tA8dpdnhqlqJ2RIMRuSvcb5PRVglklddT2dOT5yWo2oKLkJ36a3+FHplk/rChijdaSLfU8JI1nuIJS2aDDsHnWUsY/teeR3PgnY9VkLCbluLSmCY9E5oDXsx8DJ6La6QBugU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=toN1KpdT; 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="toN1KpdT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B439C2BD10; Wed, 3 Jul 2024 11:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720005235; bh=LWaW1OTdIoLabw2pECk/QlWxh1aijxSFfl4zC1mVLDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=toN1KpdTAVNYqm9dazvYvj67wqFtUpTmJB7YbBq4uCM3hh8nX8oHXBZxsNpMA78UD GeqsWMKE+UHA816ED/Fxq9xM4N1Eirk2I1k1XVl/JNh0YCP7DnOVoHQSwtuMh0kJYY n1w0mSSbAHFgUS0nrNYDkO4HhMlJoRXjWV+GnOek= 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.15 006/356] wifi: iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Date: Wed, 3 Jul 2024 12:35:42 +0200 Message-ID: <20240703102913.341318125@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240703102913.093882413@linuxfoundation.org> References: <20240703102913.093882413@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.15-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 524b0ad873578..afa89deb7bc3a 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1667,8 +1667,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