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 C7C1EFC0B; Wed, 5 Feb 2025 14:10:51 +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=1738764651; cv=none; b=hWlifgcF3zICtXprNz0DI6x73gCnmdg4SYDMSEeMxDRtDKo4bcH6JjtijBK5Pt0LM0II9f7ddTP28Vh/D4FtahJRNc6OA1rLNxpJG37PRZYdtuFJdkrr3sLVom7KkfIPrgbABhcKvzEf3CrAB1brYbnVsuWHpVOoNto3xkuRza8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764651; c=relaxed/simple; bh=bB7LIOyxlNs5MP6Gt9aZUUdCHKdX5BOev14s23AOr/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=omueRcyoBrZkUa8IiT0Nj6jrrHladX945rquRTPNN3c2KETZ60mnwcLhhj1njmnAWNn/yIjHffKR7yeYADU0URGnUG15EKhglpTZdc3YaqRlrLwDNDjrIB5BT6Qq1v61l5WgqDt98/ow01ErpzmPG1Hv3yXhUHURjpdzw/oqBHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zUGYQOkQ; 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="zUGYQOkQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 351CAC4CED1; Wed, 5 Feb 2025 14:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764651; bh=bB7LIOyxlNs5MP6Gt9aZUUdCHKdX5BOev14s23AOr/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zUGYQOkQaJfNj8ZnvYmHl1kx89TVK2f41H2mpwKZgBy2+4WvcnXvQzsWsqC2S9o4v a2gribHhvq1ZLdtVNKcSibMBS0o1KUGBa1Cx4M4ZFns4qBJa26Ij+xnbd8MaJzQIj9 vicvSXnEE+ZA5Z3gJemQqFserLNszSIR1TdPrOYo= 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 6.12 146/590] wifi: wlcore: fix unbalanced pm_runtime calls Date: Wed, 5 Feb 2025 14:38:21 +0100 Message-ID: <20250205134500.861987954@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@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 6.12-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 0c77b8524160d..42805ed7ca120 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -2612,24 +2612,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 @@ -2644,7 +2644,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