Unverified Commit 559d2345 authored by Sameer Pujar's avatar Sameer Pujar Committed by Mark Brown
Browse files

ASoC: tegra: Fix wrong value type in DMIC 



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

Fixes: 8c8ff982 ("ASoC: tegra: Add Tegra210 based DMIC 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-4-git-send-email-spujar@nvidia.com


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

sound/soc/tegra/tegra210_dmic.c

+11 −12
Original line number Diff line number Diff line
@@ -165,15 +165,15 @@ static int tegra210_dmic_get_control(struct snd_kcontrol *kcontrol, 
	if (strstr(kcontrol->id.name, "Boost Gain Volume"))

		ucontrol->value.integer.value[0] = dmic->boost_gain;

	else if (strstr(kcontrol->id.name, "Channel Select"))

		ucontrol->value.integer.value[0] = dmic->ch_select;

		ucontrol->value.enumerated.item[0] = dmic->ch_select;

	else if (strstr(kcontrol->id.name, "Mono To Stereo"))

		ucontrol->value.integer.value[0] = dmic->mono_to_stereo;

		ucontrol->value.enumerated.item[0] = dmic->mono_to_stereo;

	else if (strstr(kcontrol->id.name, "Stereo To Mono"))

		ucontrol->value.integer.value[0] = dmic->stereo_to_mono;

		ucontrol->value.enumerated.item[0] = dmic->stereo_to_mono;

	else if (strstr(kcontrol->id.name, "OSR Value"))

		ucontrol->value.integer.value[0] = dmic->osr_val;

		ucontrol->value.enumerated.item[0] = dmic->osr_val;

	else if (strstr(kcontrol->id.name, "LR Polarity Select"))

		ucontrol->value.integer.value[0] = dmic->lrsel;

		ucontrol->value.enumerated.item[0] = dmic->lrsel;



	return 0;

}
@@ -183,20 +183,19 @@ static int tegra210_dmic_put_control(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);

	struct tegra210_dmic *dmic = snd_soc_component_get_drvdata(comp);

	int value = ucontrol->value.integer.value[0];



	if (strstr(kcontrol->id.name, "Boost Gain Volume"))

		dmic->boost_gain = value;

		dmic->boost_gain = ucontrol->value.integer.value[0];

	else if (strstr(kcontrol->id.name, "Channel Select"))

		dmic->ch_select = ucontrol->value.integer.value[0];

		dmic->ch_select = ucontrol->value.enumerated.item[0];

	else if (strstr(kcontrol->id.name, "Mono To Stereo"))

		dmic->mono_to_stereo = value;

		dmic->mono_to_stereo = ucontrol->value.enumerated.item[0];

	else if (strstr(kcontrol->id.name, "Stereo To Mono"))

		dmic->stereo_to_mono = value;

		dmic->stereo_to_mono = ucontrol->value.enumerated.item[0];

	else if (strstr(kcontrol->id.name, "OSR Value"))

		dmic->osr_val = value;

		dmic->osr_val = ucontrol->value.enumerated.item[0];

	else if (strstr(kcontrol->id.name, "LR Polarity Select"))

		dmic->lrsel = value;

		dmic->lrsel = ucontrol->value.enumerated.item[0];



	return 0;

}