Merge remote-tracking branch 'asoc/fix/88pm860x' into asoc-linus

git-mirror · Sep 27, 2013 · 448c3f6 · 448c3f6
2 parents 4a10c2a + d967967
commit 448c3f6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
@@ -349,6 +349,9 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol,
 	val = ucontrol->value.integer.value[0];
 	val2 = ucontrol->value.integer.value[1];
 
+	if (val >= ARRAY_SIZE(st_table) || val2 >= ARRAY_SIZE(st_table))
+		return -EINVAL;
+
 	err = snd_soc_update_bits(codec, reg, 0x3f, st_table[val].m);
 	if (err < 0)
 		return err;