Commit fd5dfad9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Volume controls are never of boolean type 



Some limited volume controls (mostly simple attenuations) have only two
settings so the ASoC info functions misreport them as booleans. Since
we currently have no better information check for " Volume" in the
control name and always report any controls matching as being integer.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3f1a4d82

sound/soc/soc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1779,7 +1779,7 @@ int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, 
{

	int max = kcontrol->private_value;



	if (max == 1)

	if (max == 1 && !strstr(kcontrol->id.name, " Volume"))

		uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	else

		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
@@ -1809,7 +1809,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, 
	unsigned int shift = mc->shift;

	unsigned int rshift = mc->rshift;



	if (max == 1)

	if (max == 1 && !strstr(kcontrol->id.name, " Volume"))

		uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	else

		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
@@ -1916,7 +1916,7 @@ int snd_soc_info_volsw_2r(struct snd_kcontrol *kcontrol, 
		(struct soc_mixer_control *)kcontrol->private_value;

	int max = mc->max;



	if (max == 1)

	if (max == 1 && !strstr(kcontrol->id.name, " Volume"))

		uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;

	else

		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;