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

This commit is contained in:
Mark Brown 2013-09-27 14:56:19 +01:00
commit 448c3f6884

View File

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