Merge branch 'for-linus' into for-next
Back-merged for refactoring beep stuff.
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user