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 46AC7230BD4; Mon, 10 Mar 2025 17:45:54 +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=1741628755; cv=none; b=HSfxfjeq+/kUEF00k31s6tJIJ6NvxoUQaaaIZUZQ+4D6QaiP+u4w2rHQIxMka/HqQ0Q61lnmqJwtahJHvW0oXHXU75vm5VMZ71Ia2pnINmri4w1t3pqNnAHErfcPmnr2qhgRFUZM5IBMetqzSKni2DCHIPi8L541oLlsl2jfUxc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628755; c=relaxed/simple; bh=V4lcoxfMUjo6iZ90NsS1gsKiR+OH0zG5aJdoSPN8tGI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c/AIzgnCbQ8c/IumcckbcaTXXdtOeHx6VNbqphu0uGInxRcg4vDf0sfWMYKfqp0qm0vBGcS6fqFpsTRRbenSBRHhMkhzL063krA0pL4EcXdfXad/Rv17y2WGCLttj3snFfEhVcS7CZthLkryDY9VXhBhodhg3FHOQP1IhlwMOxc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ruD2vkEp; 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="ruD2vkEp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 640B1C4CEE5; Mon, 10 Mar 2025 17:45:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628754; bh=V4lcoxfMUjo6iZ90NsS1gsKiR+OH0zG5aJdoSPN8tGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ruD2vkEpdmmHw8Fal0IDz71/eY0ELRdRerxYPDRAixS/UkSIn8L7ksRsR6Hnksu9d Mm+HasVgwdOgbI34MITkC2tDhsrHjd0I8lypRs10mFHHZZinvc5sSLB3tktGoAO5Bh Thvm7s/NpuhejjE2x6AIQKy0Gwn3NVkA2jn0JePw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andreas Kemnade , Michael Nemanov , Kalle Valo , Sasha Levin Subject: [PATCH 5.15 058/620] wifi: wlcore: fix unbalanced pm_runtime calls Date: Mon, 10 Mar 2025 17:58:24 +0100 Message-ID: <20250310170547.872432650@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170545.553361750@linuxfoundation.org> References: <20250310170545.553361750@linuxfoundation.org> User-Agent: quilt/0.68 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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andreas Kemnade [ Upstream commit 996c934c8c196144af386c4385f61fcd5349af28 ] If firmware boot failes, runtime pm is put too often: [12092.708099] wlcore: ERROR firmware boot failed despite 3 retries [12092.708099] wl18xx_driver wl18xx.1.auto: Runtime PM usage count underflow! Fix that by redirecting all error gotos before runtime_get so that runtime is not put. Fixes: c40aad28a3cf ("wlcore: Make sure firmware is initialized in wl1271_op_add_interface()") Signed-off-by: Andreas Kemnade Reviewed-by: Michael Nemanov Signed-off-by: Kalle Valo Link: https://patch.msgid.link/20250104195507.402673-1-akemnade@kernel.org Signed-off-by: Sasha Levin --- drivers/net/wireless/ti/wlcore/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 5669f17b395f3..7d664380c4771 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -2552,24 +2552,24 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags) || test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) { ret = -EBUSY; - goto out; + goto out_unlock; } ret = wl12xx_init_vif_data(wl, vif); if (ret < 0) - goto out; + goto out_unlock; wlvif->wl = wl; role_type = wl12xx_get_role_type(wl, wlvif); if (role_type == WL12XX_INVALID_ROLE_TYPE) { ret = -EINVAL; - goto out; + goto out_unlock; } ret = wlcore_allocate_hw_queue_base(wl, wlvif); if (ret < 0) - goto out; + goto out_unlock; /* * TODO: after the nvs issue will be solved, move this block @@ -2584,7 +2584,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, ret = wl12xx_init_fw(wl); if (ret < 0) - goto out; + goto out_unlock; } /* -- 2.39.5