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

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

Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and... 

Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and 'asoc/topic/wm8960' into asoc-next
parents eee89f5c 931dfa69 3e2a71b2 c1fe81f2

sound/soc/codecs/wm8904.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);

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

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



	if (deemph > 1)

		return -EINVAL;

sound/soc/codecs/wm8955.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);

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

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



	if (deemph > 1)

		return -EINVAL;

sound/soc/codecs/wm8960.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);

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

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



	if (deemph > 1)

		return -EINVAL;