Merge branch 'for-linus' into for-next

Back-merged for refactoring beep stuff.
This commit is contained in:
Takashi Iwai
2013-03-18 11:04:42 +01:00
21 changed files with 167 additions and 61 deletions

View File

@@ -213,7 +213,10 @@ static int slave_put(struct snd_kcontrol *kcontrol,
}
if (!changed)
return 0;
return slave_put_val(slave, ucontrol);
err = slave_put_val(slave, ucontrol);
if (err < 0)
return err;
return 1;
}
static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,