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 7554C2BE65B for ; Wed, 13 May 2026 13:54:02 +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=1778680442; cv=none; b=GUkd3orZDHEk6tZ0Wg/Ac/OEUGooSHUHFdbR0JJZEiribRkn3/SaQ8I7es09+zULilFYHbqDptIz2bURkw1TRBCmBbtJx+kLJoUjfSDgWc/tRGwGZOgFmLyF+8pkOd0mjq1NKG5ISkRearCzXLA6W1VLTb7RhgngDW6kct3ImlY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778680442; c=relaxed/simple; bh=9sjThSRZxEBvaPkt/IaGfKx39CdqZxAK49/nBTi+67w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gCHY0s9Jc+pYZnjHWpBFzI4qRdCGX+pdrgpzYX0Kp57alsOZkRyyYrXFQnNtE7ikjcuZkkZkwNK7G6iH6AsPd3tuFx0ZnBEYkQ+f9jkZxbHoNrH63AjfRty7ZriFRPkZ5o9TuE1YFbIfvjFEs04dlrLcgTbJi5cCPF4x4czTxSQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NS8AVowO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NS8AVowO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3AA3C19425; Wed, 13 May 2026 13:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778680442; bh=9sjThSRZxEBvaPkt/IaGfKx39CdqZxAK49/nBTi+67w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NS8AVowOU/MfuzhMmqv54Asoc9GMxhQ8q0slV5G42S3krumZTW7GWk5BWIm7ZqalR 39p/FnzHQkYzxR1OhEc6nHe4NGzmD4X2qKRVymqh8PA4kq4lwe5EOPQ3jSrKeZboon GGcQ0G3bCYq6zVVYom98EIfg5MvPoIYuWpNLnCKe9GNLMY4mfFZMcjfjOQL8CQ1B60 j7Xec/Nm6gF0NsxWZ667xMxs4G6NuShxbG7RUEm+r0TO/y+Ys9yUMY2wC+tSgs/7/W inuFXFu3DgszU83Iuw7ZBNuOC8+riSCigngcd3PPDkveXE/QN9hzQfwjOtFyy97OOW Ukqv0gEHytzvA== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?C=C3=A1ssio=20Gabriel?= , Richard Fitzgerald , Takashi Iwai , Sasha Levin Subject: [PATCH 6.6.y] ALSA: hda: cs35l56: Propagate ASP TX source control errors Date: Wed, 13 May 2026 09:53:59 -0400 Message-ID: <20260513135359.3741836-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051202-kiln-obstinate-3d53@gregkh> References: <2026051202-kiln-obstinate-3d53@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- sound/pci/hda/cs35l56_hda.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c index 8d86a13b8a960..bae7b1d592c6c 100644 --- 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 snd_kcontrol *kcontrol, { 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 snd_kcontrol *kcontrol, 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; } -- 2.53.0