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

Commit 3f343f85 authored by Dmitry Artamonow's avatar Dmitry Artamonow Committed by Mark Brown
Browse files

ASoC: fix deemphasis control in wm8904/55/60 codecs 



Deemphasis control's .get callback should update control's value instead
of returning it - return value of callback function is used for indicating
error or success of operation.

Signed-off-by: default avatarDmitry Artamonow <mad_soft@inbox.ru>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 2a7b1a00

sound/soc/codecs/wm8904.c

+2 −1
Original line number Diff line number Diff line
@@ -818,7 +818,8 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);



	return wm8904->deemph;

	ucontrol->value.enumerated.item[0] = wm8904->deemph;

	return 0;

}



static int wm8904_put_deemph(struct snd_kcontrol *kcontrol,

sound/soc/codecs/wm8955.c

+2 −1
Original line number Diff line number Diff line
@@ -380,7 +380,8 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);



	return wm8955->deemph;

	ucontrol->value.enumerated.item[0] = wm8955->deemph;

	return 0;

}



static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,

sound/soc/codecs/wm8960.c

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);



	return wm8960->deemph;

	ucontrol->value.enumerated.item[0] = wm8960->deemph;

	return 0;

}



static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,