Unverified Commit 42afca1a authored by Sameer Pujar's avatar Sameer Pujar Committed by Mark Brown
Browse files

ASoC: tegra: Fix wrong value type in SFC 



The enum controls are expected to use enumerated value type.
Update relevant references in control get/put callbacks.

Fixes: b2f74ec5 ("ASoC: tegra: Add Tegra210 based SFC driver")
Suggested-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSameer Pujar <spujar@nvidia.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/1637219231-406-6-git-send-email-spujar@nvidia.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3aa0d5c8

sound/soc/tegra/tegra210_sfc.c

+12 −9
Original line number Diff line number Diff line
@@ -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;