Skip to content

Commit

Permalink
Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm895…
Browse files Browse the repository at this point in the history
…5' and 'asoc/topic/wm8960' into asoc-next
  • Loading branch information
Mark Brown committed Oct 26, 2015
4 parents eee89f5 + 931dfa6 + 3e2a71b + c1fe81f commit bb9a13a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8904.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8955.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8960.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bb9a13a

Please sign in to comment.