Skip to content

Commit

Permalink
ALSA: vmaster: Fix slave change notification
Browse files Browse the repository at this point in the history
When a value of a vmaster slave control is changed, the ctl change
notification is sometimes ignored.  This happens when the master
control overrides, e.g. when the corresponding master control is
muted.  The reason is that slave_put() returns the value of the actual
slave put callback, and it doesn't reflect the virtual slave value
change.

This patch fixes the function just to return 1 whenever a slave value
is changed.

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
tiwai committed Mar 5, 2013
1 parent 85c50a5 commit 2069d48
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion sound/core/vmaster.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 2069d48

Please sign in to comment.