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 2F98A3A7F4C; Wed, 21 Jan 2026 18:21:47 +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=1769019707; cv=none; b=Ue/FuJriQD37YHC5xJof9YBITjr7WoTr/jYYBj5vR++SMCmI6mpt5JvCj5SSzkUqCJjVh58BxMUOWCfveGm9H9DnCpveobjY/eWovBPqYRgFlvWm5cKZFbJ1jUK/0DIso1LbUJwIPiXUVYDPjI3y7owjB/PnrLZzzPM4WeJ0zy0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769019707; c=relaxed/simple; bh=yL6Op1R3TAxcasKRNj2TWbmW34b+8gdW8SRTtVIGMbQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SfHYo/KaeTNXdRBMcGtxKN5p2xLCCoNI56DSChxogoSKwa1UqndWxu+MWarXllTvGXIfmDRbsCob7PIqJAW33CZQru+/MSXIwDaOXAaDwbj9dTK8ssYeMwilUTqESV5xvdOgK9aA7MKwHfjSnJSg+alWjyBcuXlAraZgO/QJX9o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=viNB5aQZ; 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="viNB5aQZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 880EAC16AAE; Wed, 21 Jan 2026 18:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769019707; bh=yL6Op1R3TAxcasKRNj2TWbmW34b+8gdW8SRTtVIGMbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=viNB5aQZQsvpYsSsCCKld1SgN38McaB1RqJvNgNT5PkhXDOHOLkVGh+ZB5618T2iA qLd2OyIvmbr7mBFRgReA9hcpZrzXJxpZ2YyBDzqYzGZJpi2zDh/cLcNjoRmniYqkAE EUgeH9EbBrmz7W+fDQjjFeesQqSqYRTxGNrY5enI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Srinivas Kandagatla , Johan Hovold , Krzysztof Kozlowski , Srinivas Kandagatla , Mark Brown Subject: [PATCH 6.12 084/139] ASoC: codecs: wsa881x: fix unnecessary initialisation Date: Wed, 21 Jan 2026 19:15:32 +0100 Message-ID: <20260121181414.478990312@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260121181411.452263583@linuxfoundation.org> References: <20260121181411.452263583@linuxfoundation.org> User-Agent: quilt/0.69 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: Johan Hovold commit 29d71b8a5a40708b3eed9ba4953bfc2312c9c776 upstream. The soundwire update_status() callback may be called multiple times with the same ATTACHED status but initialisation should only be done when transitioning from UNATTACHED to ATTACHED. Fixes: a0aab9e1404a ("ASoC: codecs: add wsa881x amplifier support") Cc: stable@vger.kernel.org # 5.6 Cc: Srinivas Kandagatla Signed-off-by: Johan Hovold Reviewed-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260102111413.9605-3-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wsa881x.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -683,6 +683,7 @@ struct wsa881x_priv { */ unsigned int sd_n_val; int active_ports; + bool hw_init; bool port_prepared[WSA881X_MAX_SWR_PORTS]; bool port_enable[WSA881X_MAX_SWR_PORTS]; }; @@ -692,6 +693,9 @@ static void wsa881x_init(struct wsa881x_ struct regmap *rm = wsa881x->regmap; unsigned int val = 0; + if (wsa881x->hw_init) + return; + regmap_register_patch(wsa881x->regmap, wsa881x_rev_2_0, ARRAY_SIZE(wsa881x_rev_2_0)); @@ -729,6 +733,8 @@ static void wsa881x_init(struct wsa881x_ regmap_update_bits(rm, WSA881X_OTP_REG_28, 0x3F, 0x3A); regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG1, 0xFF, 0xB2); regmap_update_bits(rm, WSA881X_BONGO_RESRV_REG2, 0xFF, 0x05); + + wsa881x->hw_init = true; } static int wsa881x_component_probe(struct snd_soc_component *comp) @@ -1073,6 +1079,9 @@ static int wsa881x_update_status(struct { struct wsa881x_priv *wsa881x = dev_get_drvdata(&slave->dev); + if (status == SDW_SLAVE_UNATTACHED) + wsa881x->hw_init = false; + if (status == SDW_SLAVE_ATTACHED && slave->dev_num > 0) wsa881x_init(wsa881x);