]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: fsl_xcvr: Fix event generation in fsl_xcvr_mode_put()
authorShengjiu Wang <shengjiu.wang@nxp.com>
Wed, 1 Apr 2026 09:42:23 +0000 (17:42 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 1 Apr 2026 17:24:27 +0000 (18:24 +0100)
ALSA controls should return 1 if the value in the control changed but the
control put operation fsl_xcvr_mode_put() only returns 0 or a negative
error code, causing ALSA to not generate any change events.

Add a suitable check in the function before updating the mode variable.

Fixes: 28564486866f ("ASoC: fsl_xcvr: Add XCVR ASoC CPU DAI driver")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://patch.msgid.link/20260401094226.2900532-9-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/fsl_xcvr.c

index 008e45009c83f52af06c499257dc873b529f90d7..d7a823384c08ae324c858b1c8b44445c239ce7df 100644 (file)
@@ -225,10 +225,17 @@ static int fsl_xcvr_mode_put(struct snd_kcontrol *kcontrol,
        struct fsl_xcvr *xcvr = snd_soc_dai_get_drvdata(dai);
        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        unsigned int *item = ucontrol->value.enumerated.item;
+       int val = snd_soc_enum_item_to_val(e, item[0]);
        struct snd_soc_card *card = dai->component->card;
        struct snd_soc_pcm_runtime *rtd;
+       int ret;
+
+       if (val < FSL_XCVR_MODE_SPDIF || val > FSL_XCVR_MODE_EARC)
+               return -EINVAL;
 
-       xcvr->mode = snd_soc_enum_item_to_val(e, item[0]);
+       ret = (xcvr->mode != val);
+
+       xcvr->mode = val;
 
        fsl_xcvr_activate_ctl(dai, fsl_xcvr_arc_mode_kctl.name,
                              (xcvr->mode == FSL_XCVR_MODE_ARC));
@@ -238,7 +245,7 @@ static int fsl_xcvr_mode_put(struct snd_kcontrol *kcontrol,
        rtd = snd_soc_get_pcm_runtime(card, card->dai_link);
        rtd->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream_count =
                (xcvr->mode == FSL_XCVR_MODE_SPDIF ? 1 : 0);
-       return 0;
+       return ret;
 }
 
 static int fsl_xcvr_mode_get(struct snd_kcontrol *kcontrol,