]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: hda: cs35l56: Propagate ASP TX source control errors
authorCássio Gabriel <cassiogabrielcontato@gmail.com>
Thu, 23 Apr 2026 13:11:31 +0000 (10:11 -0300)
committerTakashi Iwai <tiwai@suse.de>
Mon, 27 Apr 2026 11:48:41 +0000 (13:48 +0200)
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 <cassiogabrielcontato@gmail.com>
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260423-alsa-cs35l56-asp-tx-source-errors-v1-1-17ea7c62ec31@gmail.com
sound/hda/codecs/side-codecs/cs35l56_hda.c

index 1ace4beef50857b8fea4856ca65fdcba186f490d..dc25960a4f231244563f3db7587e8fbf574ebc59 100644 (file)
@@ -180,11 +180,15 @@ 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;
 
        cs35l56_hda_wait_dsp_ready(cs35l56);
 
-       regmap_read(cs35l56->base.regmap, kcontrol->private_value, &reg_val);
+       ret = regmap_read(cs35l56->base.regmap, kcontrol->private_value,
+                         &reg_val);
+       if (ret)
+               return ret;
+
        reg_val &= CS35L56_ASP_TXn_SRC_MASK;
 
        for (i = 0; i < CS35L56_NUM_INPUT_SRC; ++i) {
@@ -203,15 +207,20 @@ 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;
 
        cs35l56_hda_wait_dsp_ready(cs35l56);
 
-       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;
 }