OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and 'asoc/topic/wm8960' into asoc-next

This commit is contained in:
Mark Brown 2015-10-26 11:16:20 +09:00
parent eee89f5c9a 931dfa6931 3e2a71b232 c1fe81f2cd
commit bb9a13a020
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/wm8904.c
View File

@ -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;

2
sound/soc/codecs/wm8955.c
View File

@ -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;

2
sound/soc/codecs/wm8960.c
View File

@ -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;