]> git.dujemihanovic.xyz Git - linux.git/commitdiff
ASoC: tegra: Fix wrong value type in SFC
authorSameer Pujar <spujar@nvidia.com>
Thu, 18 Nov 2021 07:07:00 +0000 (12:37 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 18 Nov 2021 19:02:22 +0000 (19:02 +0000)
The enum controls are expected to use enumerated value type.
Update relevant references in control get/put callbacks.

Fixes: b2f74ec53a6c ("ASoC: tegra: Add Tegra210 based SFC driver")
Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/1637219231-406-6-git-send-email-spujar@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/tegra/tegra210_sfc.c

index dc477ee1b82cd06041bed5ca4940a21d856f1398..cb592ef55bd399fc8895ef49cb796fd9473543a1 100644 (file)
@@ -3251,16 +3251,16 @@ static int tegra210_sfc_get_control(struct snd_kcontrol *kcontrol,
        struct tegra210_sfc *sfc = snd_soc_component_get_drvdata(cmpnt);
 
        if (strstr(kcontrol->id.name, "Input Stereo To Mono"))
-               ucontrol->value.integer.value[0] =
+               ucontrol->value.enumerated.item[0] =
                        sfc->stereo_to_mono[SFC_RX_PATH];
        else if (strstr(kcontrol->id.name, "Input Mono To Stereo"))
-               ucontrol->value.integer.value[0] =
+               ucontrol->value.enumerated.item[0] =
                        sfc->mono_to_stereo[SFC_RX_PATH];
        else if (strstr(kcontrol->id.name, "Output Stereo To Mono"))
-               ucontrol->value.integer.value[0] =
+               ucontrol->value.enumerated.item[0] =
                        sfc->stereo_to_mono[SFC_TX_PATH];
        else if (strstr(kcontrol->id.name, "Output Mono To Stereo"))
-               ucontrol->value.integer.value[0] =
+               ucontrol->value.enumerated.item[0] =
                        sfc->mono_to_stereo[SFC_TX_PATH];
 
        return 0;
@@ -3271,16 +3271,19 @@ static int tegra210_sfc_put_control(struct snd_kcontrol *kcontrol,
 {
        struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol);
        struct tegra210_sfc *sfc = snd_soc_component_get_drvdata(cmpnt);
-       int value = ucontrol->value.integer.value[0];
 
        if (strstr(kcontrol->id.name, "Input Stereo To Mono"))
-               sfc->stereo_to_mono[SFC_RX_PATH] = value;
+               sfc->stereo_to_mono[SFC_RX_PATH] =
+                       ucontrol->value.enumerated.item[0];
        else if (strstr(kcontrol->id.name, "Input Mono To Stereo"))
-               sfc->mono_to_stereo[SFC_RX_PATH] = value;
+               sfc->mono_to_stereo[SFC_RX_PATH] =
+                       ucontrol->value.enumerated.item[0];
        else if (strstr(kcontrol->id.name, "Output Stereo To Mono"))
-               sfc->stereo_to_mono[SFC_TX_PATH] = value;
+               sfc->stereo_to_mono[SFC_TX_PATH] =
+                       ucontrol->value.enumerated.item[0];
        else if (strstr(kcontrol->id.name, "Output Mono To Stereo"))
-               sfc->mono_to_stereo[SFC_TX_PATH] = value;
+               sfc->mono_to_stereo[SFC_TX_PATH] =
+                       ucontrol->value.enumerated.item[0];
        else
                return 0;