Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a67834 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw,enum_virt}() 



The ALSA core expect the put callback of a control to return 1 if the value of
the control changed and 0 if it did not. Both snd_soc_dapm_put_volsw() and
snd_soc_dapm_put_enum_virt() currently always returns 0. For both functions we
already have a 'change' variable which either contains 1 or 0 depending on
whether the value has changed or not, so just return that.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3b2f64d0

sound/soc/soc-dapm.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -2733,7 +2733,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, 
	}

	}





	mutex_unlock(&card->dapm_mutex);

	mutex_unlock(&card->dapm_mutex);

	return 0;

	return change;

}

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);

EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);
@@ -2861,7 +2861,6 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol, 
	struct soc_enum *e =

	struct soc_enum *e =

		(struct soc_enum *)kcontrol->private_value;

		(struct soc_enum *)kcontrol->private_value;

	int change;

	int change;

	int ret = 0;

	int wi;

	int wi;





	if (ucontrol->value.enumerated.item[0] >= e->max)

	if (ucontrol->value.enumerated.item[0] >= e->max)
@@ -2881,7 +2880,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol, 
	}

	}





	mutex_unlock(&card->dapm_mutex);

	mutex_unlock(&card->dapm_mutex);

	return ret;

	return change;

}

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);

EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);