ALSA: hda - Fix yet remaining issue with vmaster 0dB initialization
The previous fix for addressing the breakage in vmaster slave initialization, commita91d66129f
("ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal"), introduced a new helper to process over each slave kctl. However, this helper passes only the original kctl, not the virtual slave kctl. As a result, HD-audio driver (which is the only user so far) couldn't initialize the slave correctly because it's trying to update the value directly with the original kctl, not with the mapped kctl. This patch fixes the situation again by passing both the mapped slaved and original slave kctls to the function. Luckily there is a single caller as of now, so changing the call signature is no big matter. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197959 Fixes:a91d66129f
("ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal") Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Esse commit está contido em:
@@ -1823,7 +1823,9 @@ struct slave_init_arg {
|
||||
};
|
||||
|
||||
/* initialize the slave volume with 0dB via snd_ctl_apply_vmaster_slaves() */
|
||||
static int init_slave_0dB(struct snd_kcontrol *kctl, void *_arg)
|
||||
static int init_slave_0dB(struct snd_kcontrol *slave,
|
||||
struct snd_kcontrol *kctl,
|
||||
void *_arg)
|
||||
{
|
||||
struct slave_init_arg *arg = _arg;
|
||||
int _tlv[4];
|
||||
@@ -1860,7 +1862,7 @@ static int init_slave_0dB(struct snd_kcontrol *kctl, void *_arg)
|
||||
arg->step = step;
|
||||
val = -tlv[2] / step;
|
||||
if (val > 0) {
|
||||
put_kctl_with_value(kctl, val);
|
||||
put_kctl_with_value(slave, val);
|
||||
return val;
|
||||
}
|
||||
|
||||
@@ -1868,7 +1870,9 @@ static int init_slave_0dB(struct snd_kcontrol *kctl, void *_arg)
|
||||
}
|
||||
|
||||
/* unmute the slave via snd_ctl_apply_vmaster_slaves() */
|
||||
static int init_slave_unmute(struct snd_kcontrol *slave, void *_arg)
|
||||
static int init_slave_unmute(struct snd_kcontrol *slave,
|
||||
struct snd_kcontrol *kctl,
|
||||
void *_arg)
|
||||
{
|
||||
return put_kctl_with_value(slave, 1);
|
||||
}
|
||||
|
Referência em uma nova issue
Block a user