aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-27 14:56:24 +0100
committerMark Brown <broonie@linaro.org>2013-09-27 14:56:24 +0100
commit267666ea3bd6e804c2c8bbafbe628026be963d06 (patch)
tree44f81dcbc20774d67819d8a57985fec290eb489a /sound
parent8516e6483bc870dfa76184657c3ddf5a8906e6db (diff)
parentf8d7b13e14357ed19d2ca2799539600418dc3939 (diff)
downloadlinux-linaro-stable-267666ea3bd6e804c2c8bbafbe628026be963d06.tar.gz
Merge remote-tracking branch 'asoc/fix/max98095' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/max98095.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 41cdd1642970..8dbcacd44e6a 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -1863,7 +1863,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
struct max98095_pdata *pdata = max98095->pdata;
int channel = max98095_get_eq_channel(kcontrol->id.name);
struct max98095_cdata *cdata;
- int sel = ucontrol->value.integer.value[0];
+ unsigned int sel = ucontrol->value.integer.value[0];
struct max98095_eq_cfg *coef_set;
int fs, best, best_val, i;
int regmask, regsave;
@@ -2016,7 +2016,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,
struct max98095_pdata *pdata = max98095->pdata;
int channel = max98095_get_bq_channel(codec, kcontrol->id.name);
struct max98095_cdata *cdata;
- int sel = ucontrol->value.integer.value[0];
+ unsigned int sel = ucontrol->value.integer.value[0];
struct max98095_biquad_cfg *coef_set;
int fs, best, best_val, i;
int regmask, regsave;