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 6C5C63C819C; Fri, 15 May 2026 16:14:20 +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=1778861660; cv=none; b=juemctGlITiXcGG4g3TNIBKAkG8yHtDFXFI8OQVxi28l9pRXGLnFQ7+Z2E9jMCuYZWj5YchjXi2mticibmCb4X5Er/8peNQQNT3tf8QDEy8LcYh+8vH8yNMXnVF7hDYsJiaHTFsa78Nzi/Qy38vNGNkOnOWXFz4+Cqm3c+VTyC4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861660; c=relaxed/simple; bh=fOQTfX/ophaO3jSrSWMr8lSfh0i/pUtr+/6NnytelsI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=E2pKTyymvsgKgVAmAZUMrGbkXO5s8CfjgdTPUWwkL9TfCxrJnbwJmwhPWJRLIsis9K763bnnf8kl0kEGxGGGw170xtsFD6dfLfTcT1cVC1d6f3AqCQICYQjFI8xfKIQE7b25B1F0rB39vd80cWkhPdtlyMLZ4tAOfUku8E0rH7Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QVHLbtPn; 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="QVHLbtPn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03622C2BCB3; Fri, 15 May 2026 16:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861660; bh=fOQTfX/ophaO3jSrSWMr8lSfh0i/pUtr+/6NnytelsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QVHLbtPn5lZ2LSxdAM7uDuunpsl3cmcejXj3ocKNqK2x13YH2aNyp1+OU1TWcfihm dKrp9B0stE2Szt9Fc4Iv9ezzMYkqPwteT1dX5YdnYohrqFy7yI5Kika6zKMZFjVM4D u0QaK9ha7fdR8O1aAwiwqWcZkgycxpdBvUvEuLQw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?C=C3=A1ssio=20Gabriel?= , Richard Fitzgerald , Takashi Iwai , Sasha Levin Subject: [PATCH 6.6 413/474] ALSA: hda: cs35l56: Propagate ASP TX source control errors Date: Fri, 15 May 2026 17:48:42 +0200 Message-ID: <20260515154723.993846287@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@linuxfoundation.org> User-Agent: quilt/0.69 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cássio Gabriel [ Upstream commit 0faacc0841d66f3cf51989c10a83f3a82d52ff2c ] cs35l56_hda_mixer_get() ignores regmap_read() and cs35l56_hda_mixer_put() ignores regmap_update_bits_check(). This makes the ASP TX source controls report success when a regmap access fails. The write path returns no change instead of an error, and the read path continues after a failed read instead of aborting the control callback. Propagate the regmap errors, matching the posture and volume controls in this driver. Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") Cc: stable@vger.kernel.org Signed-off-by: Cássio Gabriel Reviewed-by: Richard Fitzgerald Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/20260423-alsa-cs35l56-asp-tx-source-errors-v1-1-17ea7c62ec31@gmail.com [ adjusted path to sound/pci/hda/ and dropped cs35l56_hda_wait_dsp_ready() context ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/cs35l56_hda.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) --- a/sound/pci/hda/cs35l56_hda.c +++ b/sound/pci/hda/cs35l56_hda.c @@ -176,9 +176,13 @@ static int cs35l56_hda_mixer_get(struct { struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol); unsigned int reg_val; - int i; + int i, ret; + + ret = regmap_read(cs35l56->base.regmap, kcontrol->private_value, + ®_val); + if (ret) + return ret; - regmap_read(cs35l56->base.regmap, kcontrol->private_value, ®_val); reg_val &= CS35L56_ASP_TXn_SRC_MASK; for (i = 0; i < CS35L56_NUM_INPUT_SRC; ++i) { @@ -197,13 +201,18 @@ static int cs35l56_hda_mixer_put(struct struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol); unsigned int item = ucontrol->value.enumerated.item[0]; bool changed; + int ret; if (item >= CS35L56_NUM_INPUT_SRC) return -EINVAL; - regmap_update_bits_check(cs35l56->base.regmap, kcontrol->private_value, - CS35L56_INPUT_MASK, cs35l56_tx_input_values[item], - &changed); + ret = regmap_update_bits_check(cs35l56->base.regmap, + kcontrol->private_value, + CS35L56_INPUT_MASK, + cs35l56_tx_input_values[item], + &changed); + if (ret) + return ret; return changed; }